X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fc25a89ac1e6c5208db24bfc0abc8666b791dc6..694f70fa9c0cc8889c208020bf75b2e3861f6818:/contrib/samples/ogl/studio/cspalette.h

diff --git a/contrib/samples/ogl/studio/cspalette.h b/contrib/samples/ogl/studio/cspalette.h
index 67a8e63740..8583f85d5a 100644
--- a/contrib/samples/ogl/studio/cspalette.h
+++ b/contrib/samples/ogl/studio/cspalette.h
@@ -6,19 +6,19 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _STUDIO_CSPALETTE_H_
 #define _STUDIO_CSPALETTE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 // #pragma interface
 #endif
 
 #include <wx/wx.h>
 #include <wx/string.h>
-#include <wx/tbarsmpl.h>
+#include <wx/deprecated/tbarsmpl.h>
 
 /*
  * Object editor tool palette
@@ -28,13 +28,16 @@
 // 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.
-#define TOOLPALETTECLASS    wxToolBarSimple
+// 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
 {
 public:
 
-  csEditorToolPalette(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
+  csEditorToolPalette(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
     const wxSize& size = wxDefaultSize,
     long style = wxTB_VERTICAL);