Merge branch 'gdefos' into 'master'

[xonotic/netradiant.git] / contrib / camera / camera.cpp

diff --git a/contrib/camera/camera.cpp b/contrib/camera/camera.cpp
index 5647f4c0f082f0bd683368eceb73f271b6c5b196..635b36796133c1eb08af4c2e824453a19932e81b 100644 (file)
--- a/contrib/camera/camera.cpp
+++ b/contrib/camera/camera.cpp
@@ -39,8 +39,8 @@ static const char *PLUGIN_NAME = "Camera";
 static const char *PLUGIN_COMMANDS = "About...,-,Load Camera...,-,Preview Camera,-,Camera Inspector...,-,New Spline Camera,New Interpolated Camera,New Fixed Camera";
 
 // globals
-GtkWidget *g_pRadiantWnd = NULL;
-GtkWidget *g_pCameraInspectorWnd = NULL;
+ui::Window g_pRadiantWnd{ui::null};
+ui::Window g_pCameraInspectorWnd{ui::null};
 CCamera   *firstCam = NULL;       // double linked list
 CCamera   *firstFreeCam = NULL;   // single linked list
 CCamera   *currentCam = NULL;     // single item
@@ -132,7 +132,7 @@ class CameraInspectorButton : public IToolbarButton
 {
 public:
 virtual const char* getImage() const {
-       return "camera_insp.bmp";
+       return "camera_insp.jpg";
 }
 virtual const char* getText() const {
        return "Inspector";