overseeing the obvious, there is already a perfect scroll call for HIView...

[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..26ca01fbe70bfcb33e940469830ba869d2f19a22 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>


@@ -72,8 +73,8 @@ public:
 
 // Overridables
     // Start/end copying
 
 // Overridables
     // Start/end copying

-    virtual bool OnStartCopy(wxDiagram* diagramTo) { return TRUE; };
-    virtual bool OnEndCopy(wxDiagram* diagramTo) { return TRUE; };
+    virtual bool OnStartCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; };
+    virtual bool OnEndCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; };

 
     // Override this to e.g. have the shape added through a Do/Undo command system.
     // By default, we'll just add it directly to the destination diagram, and
 
     // Override this to e.g. have the shape added through a Do/Undo command system.
     // By default, we'll just add it directly to the destination diagram, and


@@ -96,10 +97,10 @@ public:
     ~csDiagramClipboard() {}
 
     // Start/end copying
     ~csDiagramClipboard() {}
 
     // Start/end copying

-    bool OnStartCopy(wxDiagram* diagramTo);
-    bool OnEndCopy(wxDiagram* diagramTo);
+    virtual bool OnStartCopy(wxDiagram* diagramTo);
+    virtual bool OnEndCopy(wxDiagram* diagramTo);

 
 

-    bool OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc);
+    virtual bool OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc);

 
 protected:
     csDiagramCommand*   m_currentCmd;
 
 protected:
     csDiagramCommand*   m_currentCmd;


@@ -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);