Added SWIG patches to allow compiling the generated code with

[wxWidgets.git] / contrib / samples / ogl / studio / cspalette.h

diff --git a/contrib/samples/ogl/studio/cspalette.h b/contrib/samples/ogl/studio/cspalette.h
index 8583f85d5aaa5265b3979076315e45f4cc658805..15f34157bd7bd1431e32ad665324d676d5837f92 100644 (file)
--- a/contrib/samples/ogl/studio/cspalette.h
+++ b/contrib/samples/ogl/studio/cspalette.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cspalette.h
+// Name:        contrib/samples/ogl/studio/cspalette.h
 // Purpose:     OGL sample palette
 // Author:      Julian Smart
 // Modified by:
@@ -12,25 +12,15 @@
 #ifndef _STUDIO_CSPALETTE_H_
 #define _STUDIO_CSPALETTE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-// #pragma interface
-#endif
-
-#include <wx/wx.h>
-#include <wx/string.h>
-#include <wx/deprecated/tbarsmpl.h>
+#include "wx/wx.h"
+#include "wx/string.h"
+#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
 
 /*
  * Object editor tool palette
  *
  */
 
-// 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.
-// ABX: Simple toolbar is not available in default compilation and is deprecated
-//      so I use wxToolBar anyway
-// #define TOOLPALETTECLASS    wxToolBarSimple
 #define TOOLPALETTECLASS    wxToolBar
 
 class csEditorToolPalette: public TOOLPALETTECLASS