redo a windows fix from 20dbf5c that was mistakenly lost

[xonotic/netradiant.git] / radiant / feedback.h

diff --git a/radiant/feedback.h b/radiant/feedback.h
index 04e98bb2d85ae26c48920caec664d13b58fd7caa..b683a316d76ea07abe1cc48b43c238b36614b68e 100644 (file)
--- a/radiant/feedback.h
+++ b/radiant/feedback.h
@@ -30,7 +30,6 @@
 
 #include "math/vector.h"
 #include "stream/stringstream.h"
-#include <glib.h>
 #include "xmlstuff.h"
 #include "dialog.h"
 #include "xywindow.h"
@@ -40,6 +39,7 @@
 class IGL2DWindow
 {
 public:
+virtual ~IGL2DWindow() = default;
 // Increment the number of references to this object
 virtual void IncRef() = 0;
 // Decrement the reference count
@@ -143,13 +143,12 @@ void DecRef() {
 void Draw2D( VIEWTYPE vt );
 };
 
-typedef struct _GtkListStore GtkListStore;
 
 class CDbgDlg : public Dialog
 {
 GPtrArray *m_pFeedbackElements;
 // the list widget we use in the dialog
-GtkListStore* m_clist;
+ui::ListStore m_clist{ui::null};
 ISAXHandler *m_pHighlight;
 IGL2DWindow* m_pDraw2D;
 public:
@@ -171,13 +170,13 @@ void draw2D( VIEWTYPE viewType ){
        }
 }
 void destroyWindow(){
-       if ( GetWidget() != 0 ) {
+       if ( GetWidget() ) {
                Destroy();
        }
 }
 //  void HideDlg();
 protected:
-GtkWindow* BuildDialog();
+ui::Window BuildDialog();
 };
 
 extern CDbgDlg g_DbgDlg;