X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a82c9ecc9a2cba9727b538c818ebdba243eacbc..fe947a6116844e23acf8458512f452904a4f08f9:/contrib/samples/ogl/ogledit/palette.h?ds=sidebyside

diff --git a/contrib/samples/ogl/ogledit/palette.h b/contrib/samples/ogl/ogledit/palette.h
index 5877981799..09b472ae9a 100644
--- a/contrib/samples/ogl/ogledit/palette.h
+++ b/contrib/samples/ogl/ogledit/palette.h
@@ -18,11 +18,8 @@
 
 #include <wx/wx.h>
 #include <wx/string.h>
-#if 0 // def __WXGTK__
-#include <wx/toolbar.h>
-#else
+#include <wx/deprecated/setup.h>
 #include <wx/deprecated/tbarsmpl.h>
-#endif
 
 /*
  * Object editor tool palette
@@ -32,11 +29,14 @@
 // TODO for wxWin: wxToolBar95 cannot be moved to a non-0,0 position!
 // Needs to have a parent window...
 // So use a simple toolbar at present.
-#if 0 // def __WXGTK__
+// ABX: Simple toolbar is not available in default compilation
+//      so I use wxToolBar anyway
+// #if 0 // def __WXGTK__
+// #define TOOLPALETTECLASS    wxToolBar
+// #else
+// #define TOOLPALETTECLASS    wxToolBarSimple
+// #endif
 #define TOOLPALETTECLASS    wxToolBar
-#else
-#define TOOLPALETTECLASS    wxToolBarSimple
-#endif
 
 class EditorToolPalette: public TOOLPALETTECLASS
 {