blind fix for Unicode key handling (patch 1615989)

[wxWidgets.git] / contrib / samples / ogl / ogledit / palette.h

diff --git a/contrib/samples/ogl/ogledit/palette.h b/contrib/samples/ogl/ogledit/palette.h
index 2e9102f7db62ed768d0790a49313f6fc2eab93f4..a65c2b8627798329f0ebed9598ff810bafa03e87 100644 (file)
--- a/contrib/samples/ogl/ogledit/palette.h
+++ b/contrib/samples/ogl/ogledit/palette.h
@@ -1,28 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        palette.h
+// Name:        contrib/samples/ogl/ogledit/palette.h
 // Purpose:     OGL sample palette
 // Author:      Julian Smart
 // Modified by:
 // 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_
 
-#ifdef __GNUG__
-// #pragma interface
-#endif
-
-#include <wx/wx.h>
-#include <wx/string.h>
-#if 0 // def __WXGTK__
-#include <wx/toolbar.h>
-#else
-#include <wx/tbarsmpl.h>
-#endif
+#include "wx/wx.h"
+#include "wx/string.h"
+#include "wx/deprecated/setup.h"
+#include "wx/deprecated/tbarsmpl.h"
 
 /*
  * Object editor tool palette
@@ -32,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
 {