wxTinderbox build fixes.

[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..dbda6fa11f1c95ab812e86ae09c320238a3cf775 100644 (file)
--- a/contrib/samples/ogl/studio/shapes.h
+++ b/contrib/samples/ogl/studio/shapes.h
@@ -12,15 +12,9 @@
 #ifndef _STUDIO_SHAPES_H_
 #define _STUDIO_SHAPES_H_
 
-#ifdef __GNUG__
-// #pragma interface
-#endif
-
 #include <wx/docview.h>
 #include <wx/string.h>
-#include <wx/wxexpr.h>
-
-#include <wx/ogl/ogl.h>
+#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
 #include <wx/ogl/basicp.h>
 #include <wx/ogl/linesp.h>
 #include <wx/ogl/drawn.h>
@@ -30,15 +24,17 @@ class csDiagramDocument;
 /*
  * Override a few members for this application
  */
- 
+
 class csDiagram: public wxDiagram
 {
 DECLARE_CLASS(csDiagram)
 public:
     csDiagram(csDiagramDocument* doc) { m_doc = doc; }
     ~csDiagram();
+#if wxUSE_PROLOGIO
     bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
     bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
+#endif // wxUSE_PROLOGIO
 
     inline csDiagramDocument* GetDocument() const { return m_doc; }
     virtual void Redraw(wxDC& dc);
@@ -72,8 +68,8 @@ public:
 
 // 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
@@ -96,10 +92,10 @@ public:
     ~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;
@@ -205,7 +201,7 @@ public:
 /*
  * Temporary arc label object
  */
- 
+
 class csLabelShape: public wxLabelShape
 {
   DECLARE_DYNAMIC_CLASS(csLabelShape)
@@ -225,7 +221,7 @@ class csEvtHandler: public wxShapeEvtHandler
 {
  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);