Rebake after recguard.h added to bakefiles

[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 4e77abc4c041022abacd77e9bca2b02e5e7c6ebe..ce1e3a7b869117983580aa8afcf64b17c4436190 100644 (file)
--- a/contrib/samples/ogl/studio/doc.h
+++ b/contrib/samples/ogl/studio/doc.h
@@ -6,27 +6,28 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _STUDIO_DOC_H_
 #define _STUDIO_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>
+#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
+
 #include "shapes.h"
 
 /*
  * A diagram document, which contains a diagram.
  */
- 
+
 class csDiagramDocument: public wxDocument
 {
   DECLARE_DYNAMIC_CLASS(csDiagramDocument)
@@ -34,11 +35,13 @@ public:
   csDiagramDocument();
   ~csDiagramDocument();
 
+#if wxUSE_PROLOGIO
   bool OnSaveDocument(const wxString& file);
   bool OnOpenDocument(const wxString& file);
-  
+#endif // wxUSE_PROLOGIO
+
   inline wxDiagram *GetDiagram() { return &m_diagram; }
-  
+
   bool OnCloseDocument();
 
 protected:
@@ -68,7 +71,7 @@ protected:
 
  */
 
-  
+
 class csCommandState;
 class csDiagramCommand: public wxCommand
 {