added bookctrl.h and listbook.h; moved bookctrl.cpp to the correct place

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

diff --git a/contrib/samples/ogl/studio/shapes.h b/contrib/samples/ogl/studio/shapes.h
index fa183b46bb2757de2a7641c90a066fbced49e11e..117721dfbe0b1e831e5771e63a070a4f04816fbf 100644 (file)
--- a/contrib/samples/ogl/studio/shapes.h
+++ b/contrib/samples/ogl/studio/shapes.h
@@ -12,13 +12,14 @@
 #ifndef _STUDIO_SHAPES_H_
 #define _STUDIO_SHAPES_H_
 
 #ifndef _STUDIO_SHAPES_H_
 #define _STUDIO_SHAPES_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 // #pragma interface
 #endif
 
 #include <wx/docview.h>
 #include <wx/string.h>
 // #pragma interface
 #endif
 
 #include <wx/docview.h>
 #include <wx/string.h>

-#include <wx/wxexpr.h>
+#include <wx/deprecated/setup.h>
+#include <wx/deprecated/wxexpr.h>

 
 #include <wx/ogl/ogl.h>
 #include <wx/ogl/basicp.h>
 
 #include <wx/ogl/ogl.h>
 #include <wx/ogl/basicp.h>


@@ -225,7 +226,7 @@ class csEvtHandler: public wxShapeEvtHandler
 {
  DECLARE_DYNAMIC_CLASS(csEvtHandler)
  public:
 {
  DECLARE_DYNAMIC_CLASS(csEvtHandler)
  public:

-  csEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL, const wxString& lab = "");
+  csEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL, const wxString& lab = wxEmptyString);

   ~csEvtHandler();
 
   void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
   ~csEvtHandler();
 
   void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);