X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Ffeedback.h;h=b683a316d76ea07abe1cc48b43c238b36614b68e;hb=e3af470d9d19e105c9a9c6228931ee2645d09371;hp=94e2c7e8586c8fb20851dce882c7fca3d5c3ab4e;hpb=b7e36c120eb1546a6c6f97f30e42ab7f9a559c61;p=xonotic%2Fnetradiant.git diff --git a/radiant/feedback.h b/radiant/feedback.h index 94e2c7e8..b683a316 100644 --- a/radiant/feedback.h +++ b/radiant/feedback.h @@ -30,7 +30,6 @@ #include "math/vector.h" #include "stream/stringstream.h" -#include #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;