Add <contrib-lib> bakefile tag. Like <wx-lib> except that in VC++ '.dsw' files

[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 2e369607362ebdaae3bd638b2a712bfdf8040682..f4373b75cc049856234258d291244e783de6bb83 100644 (file)
--- a/contrib/samples/ogl/studio/cspalette.h
+++ b/contrib/samples/ogl/studio/cspalette.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _STUDIO_CSPALETTE_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _STUDIO_CSPALETTE_H_


@@ -18,26 +18,20 @@
 
 #include <wx/wx.h>
 #include <wx/string.h>
 
 #include <wx/wx.h>
 #include <wx/string.h>

-#include <wx/deprecated/tbarsmpl.h>
+#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h

 
 /*
  * Object editor tool palette
  *
  */
 
 
 /*
  * 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
 {
 public:
 
 #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);
 
     const wxSize& size = wxDefaultSize,
     long style = wxTB_VERTICAL);