Added SWIG patches to allow compiling the generated code with

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

diff --git a/contrib/samples/ogl/studio/doc.h b/contrib/samples/ogl/studio/doc.h
index a5bf77a7e4fd21bea332d2b0ae10524604a103ea..5cd29aecdf598a7ce45bee148b9f025443c70254 100644 (file)
--- a/contrib/samples/ogl/studio/doc.h
+++ b/contrib/samples/ogl/studio/doc.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        doc.h
+// Name:        contrib/samples/ogl/studio/doc.h

 // Purpose:     Document classes
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Document classes
 // Author:      Julian Smart
 // Modified by:


@@ -12,24 +12,18 @@
 #ifndef _STUDIO_DOC_H_
 #define _STUDIO_DOC_H_
 
 #ifndef _STUDIO_DOC_H_
 #define _STUDIO_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/deprecated/wxexpr.h>
+#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h

 
 

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

 #include "shapes.h"
 
 /*
  * A diagram document, which contains a diagram.
  */
 #include "shapes.h"
 
 /*
  * A diagram document, which contains a diagram.
  */

- 
+

 class csDiagramDocument: public wxDocument
 {
   DECLARE_DYNAMIC_CLASS(csDiagramDocument)
 class csDiagramDocument: public wxDocument
 {
   DECLARE_DYNAMIC_CLASS(csDiagramDocument)


@@ -37,11 +31,13 @@ public:
   csDiagramDocument();
   ~csDiagramDocument();
 
   csDiagramDocument();
   ~csDiagramDocument();
 

+#if wxUSE_PROLOGIO

   bool OnSaveDocument(const wxString& file);
   bool OnOpenDocument(const wxString& file);
   bool OnSaveDocument(const wxString& file);
   bool OnOpenDocument(const wxString& file);

-  
+#endif // wxUSE_PROLOGIO
+

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

-  
+

   bool OnCloseDocument();
 
 protected:
   bool OnCloseDocument();
 
 protected:


@@ -71,7 +67,7 @@ protected:
 
  */
 
 
  */
 

-  
+

 class csCommandState;
 class csDiagramCommand: public wxCommand
 {
 class csCommandState;
 class csDiagramCommand: public wxCommand
 {