X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34f7e40fa9d501dd5fd0d61172f116f353af1a2c..e77138c0e2871600956d3186ce046454a6fbce21:/contrib/samples/ogl/ogledit/palette.h

diff --git a/contrib/samples/ogl/ogledit/palette.h b/contrib/samples/ogl/ogledit/palette.h
index d49d7b4770..c997e51711 100644
--- a/contrib/samples/ogl/ogledit/palette.h
+++ b/contrib/samples/ogl/ogledit/palette.h
@@ -6,16 +6,12 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGLSAMPLE_PALETTE_H_
 #define _OGLSAMPLE_PALETTE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-// #pragma interface
-#endif
-
 #include <wx/wx.h>
 #include <wx/string.h>
 #include <wx/deprecated/setup.h>
@@ -29,11 +25,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
 {