X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd107c50be43e8d4dbdba20df162faf119a3781c..97ee90eec5faa0f361c47e39ee14299d07bbb50b:/contrib/samples/ogl/ogledit/doc.h

diff --git a/contrib/samples/ogl/ogledit/doc.h b/contrib/samples/ogl/ogledit/doc.h
index c39f5f0873..bcadc567ca 100644
--- a/contrib/samples/ogl/ogledit/doc.h
+++ b/contrib/samples/ogl/ogledit/doc.h
@@ -6,19 +6,25 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGLSAMPLE_DOC_H_
 #define _OGLSAMPLE_DOC_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 // #pragma interface
 #endif
 
 #include <wx/docview.h>
+#include <wx/cmdproc.h>
 #include <wx/string.h>
-#include <wx/wxexpr.h>
+
+#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
+
+#if wxUSE_PROLOGIO
+#include <wx/deprecated/wxexpr.h>
+#endif
 
 #include <wx/ogl/ogl.h>
 
@@ -29,20 +35,22 @@
 /*
  * Override a few members for this application
  */
- 
+
 class MyDiagram: public wxDiagram
 {
  public:
   MyDiagram(void) {}
+#if wxUSE_PROLOGIO
   bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
   bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
+#endif
 };
 
 /*
  * A few new shape classes so we have a 1:1 mapping
  * between palette symbol and unique class
  */
- 
+
 class wxRoundedRectangleShape: public wxRectangleShape
 {
   DECLARE_DYNAMIC_CLASS(wxRoundedRectangleShape)
@@ -63,12 +71,12 @@ class wxDiamondShape: public wxPolygonShape
  * All shape event behaviour is routed through this handler, so we don't
  * have to derive from each shape class. We plug this in to each shape.
  */
- 
+
 class MyEvtHandler: public wxShapeEvtHandler
 {
  public:
   wxString label;
-  MyEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL, const wxString& lab = ""):wxShapeEvtHandler(prev, shape)
+  MyEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL, const wxString& lab = wxEmptyString):wxShapeEvtHandler(prev, shape)
   {
     label = lab;
   }
@@ -85,14 +93,14 @@ class MyEvtHandler: public wxShapeEvtHandler
 /*
  * A diagram document, which contains a diagram.
  */
- 
+
 class DiagramDocument: public wxDocument
 {
   DECLARE_DYNAMIC_CLASS(DiagramDocument)
  private:
  public:
   MyDiagram diagram;
-  
+
   DiagramDocument(void);
   ~DiagramDocument(void);
 
@@ -103,9 +111,9 @@ class DiagramDocument: public wxDocument
     virtual wxOutputStream& SaveObject(wxOutputStream& stream);
     virtual wxInputStream& LoadObject(wxInputStream& stream);
 #endif
-  
+
   inline wxDiagram *GetDiagram() { return &diagram; }
-  
+
   bool OnCloseDocument(void);
 };
 
@@ -134,7 +142,7 @@ class DiagramDocument: public wxDocument
  * Assume, as here, that we keep a pointer to the old shape so we reuse it
  * when we recreate.
  */
- 
+
 class DiagramCommand: public wxCommand
 {
  protected:
@@ -155,12 +163,12 @@ class DiagramCommand: public wxCommand
   wxString shapeLabel;
  public:
   // Multi-purpose constructor for creating, deleting shapes
-  DiagramCommand(char *name, int cmd, DiagramDocument *ddoc, wxClassInfo *shapeInfo = NULL,
-     double x = 0.0, double y = 0.0, bool sel = FALSE, wxShape *theShape = NULL, wxShape *fs = NULL, wxShape *ts = NULL);
+  DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, wxClassInfo *shapeInfo = NULL,
+     double x = 0.0, double y = 0.0, bool sel = false, wxShape *theShape = NULL, wxShape *fs = NULL, wxShape *ts = NULL);
 
   // Property-changing command constructors
-  DiagramCommand(char *name, int cmd, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape);
-  DiagramCommand(char *name, int cmd, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape);
+  DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape);
+  DiagramCommand(const wxString& name, int cmd, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape);
 
   ~DiagramCommand(void);