Changes that were in aclocal.m4 but not here

[wxWidgets.git] / contrib / samples / ogl / ogledit / doc.h

diff --git a/contrib/samples/ogl/ogledit/doc.h b/contrib/samples/ogl/ogledit/doc.h
index 71521baac7b0e89d67bd9f11a2db951861326cd8..50658ffa27a23b967f5e2cd0b1cf35876d0694ed 100644 (file)
--- a/contrib/samples/ogl/ogledit/doc.h
+++ b/contrib/samples/ogl/ogledit/doc.h
@@ -12,14 +12,19 @@
 #ifndef _OGLSAMPLE_DOC_H_
 #define _OGLSAMPLE_DOC_H_
 
 #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>
 // #pragma interface
 #endif
 
 #include <wx/docview.h>
 #include <wx/cmdproc.h>
 #include <wx/string.h>

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

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


@@ -35,8 +40,10 @@ class MyDiagram: public wxDiagram
 {
  public:
   MyDiagram(void) {}
 {
  public:
   MyDiagram(void) {}

+#if wxUSE_PROLOGIO

   bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
   bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
   bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
   bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);

+#endif

 };
 
 /*
 };
 
 /*


@@ -69,7 +76,7 @@ class MyEvtHandler: public wxShapeEvtHandler
 {
  public:
   wxString label;
 {
  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;
   }
   {
     label = lab;
   }


@@ -156,12 +163,12 @@ class DiagramCommand: public wxCommand
   wxString shapeLabel;
  public:
   // Multi-purpose constructor for creating, deleting shapes
   wxString shapeLabel;
  public:
   // Multi-purpose constructor for creating, deleting shapes

-  DiagramCommand(char *name, int cmd, DiagramDocument *ddoc, wxClassInfo *shapeInfo = 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
      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);
 
 
   ~DiagramCommand(void);