offset version by 1 to avoid having compatibility_version of 0.0.0 under Darwin:...

[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 0316e5667142c81c27ab4e2f5e02320127c4df7e..68fe372062d852b041de0667d1b850a9675175d3 100644 (file)
--- a/contrib/samples/ogl/ogledit/doc.h
+++ b/contrib/samples/ogl/ogledit/doc.h
@@ -12,15 +12,11 @@
 #ifndef _OGLSAMPLE_DOC_H_
 #define _OGLSAMPLE_DOC_H_
 
 #ifndef _OGLSAMPLE_DOC_H_
 #define _OGLSAMPLE_DOC_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-// #pragma interface
-#endif
-

 #include <wx/docview.h>
 #include <wx/cmdproc.h>
 #include <wx/string.h>
 
 #include <wx/docview.h>
 #include <wx/cmdproc.h>
 #include <wx/string.h>
 

-#include <wx/deprecated/setup.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>
 
 #if wxUSE_PROLOGIO
 #include <wx/deprecated/wxexpr.h>


@@ -35,7 +31,7 @@
 /*
  * Override a few members for this application
  */
 /*
  * Override a few members for this application
  */

- 
+

 class MyDiagram: public wxDiagram
 {
  public:
 class MyDiagram: public wxDiagram
 {
  public:


@@ -50,7 +46,7 @@ class MyDiagram: public wxDiagram
  * A few new shape classes so we have a 1:1 mapping
  * between palette symbol and unique class
  */
  * 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)
 class wxRoundedRectangleShape: public wxRectangleShape
 {
   DECLARE_DYNAMIC_CLASS(wxRoundedRectangleShape)


@@ -71,7 +67,7 @@ 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.
  */
  * 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:
 class MyEvtHandler: public wxShapeEvtHandler
 {
  public:


@@ -93,14 +89,14 @@ class MyEvtHandler: public wxShapeEvtHandler
 /*
  * A diagram document, which contains a diagram.
  */
 /*
  * A diagram document, which contains a diagram.
  */

- 
+

 class DiagramDocument: public wxDocument
 {
   DECLARE_DYNAMIC_CLASS(DiagramDocument)
  private:
  public:
   MyDiagram diagram;
 class DiagramDocument: public wxDocument
 {
   DECLARE_DYNAMIC_CLASS(DiagramDocument)
  private:
  public:
   MyDiagram diagram;

-  
+

   DiagramDocument(void);
   ~DiagramDocument(void);
 
   DiagramDocument(void);
   ~DiagramDocument(void);
 


@@ -111,9 +107,9 @@ class DiagramDocument: public wxDocument
     virtual wxOutputStream& SaveObject(wxOutputStream& stream);
     virtual wxInputStream& LoadObject(wxInputStream& stream);
 #endif
     virtual wxOutputStream& SaveObject(wxOutputStream& stream);
     virtual wxInputStream& LoadObject(wxInputStream& stream);
 #endif

-  
+

   inline wxDiagram *GetDiagram() { return &diagram; }
   inline wxDiagram *GetDiagram() { return &diagram; }

-  
+

   bool OnCloseDocument(void);
 };
 
   bool OnCloseDocument(void);
 };
 


@@ -142,7 +138,7 @@ class DiagramDocument: public wxDocument
  * Assume, as here, that we keep a pointer to the old shape so we reuse it
  * when we recreate.
  */
  * Assume, as here, that we keep a pointer to the old shape so we reuse it
  * when we recreate.
  */

- 
+

 class DiagramCommand: public wxCommand
 {
  protected:
 class DiagramCommand: public wxCommand
 {
  protected: