use wxHAVE_U_ESCAPE to accomodate old compilers

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

diff --git a/contrib/samples/ogl/studio/studio.h b/contrib/samples/ogl/studio/studio.h
index 599f693aa51e01215f942ed45575f667ea4fc113..c23652ad898a723a71499248972713b258016cfc 100644 (file)
--- a/contrib/samples/ogl/studio/studio.h
+++ b/contrib/samples/ogl/studio/studio.h
@@ -1,22 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        Studio.h
+// Name:        contrib/samples/ogl/studio/studio.h
 // Purpose:     Studio application class
 // Author:      Julian Smart
 // Modified by:
 // Created:     27/7/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _STUDIO_STUDIO_H_
 #define _STUDIO_STUDIO_H_
 
-#include <wx/docmdi.h>
-#include <wx/help.h>
+#include "wx/docmdi.h"
+#include "wx/help.h"
+#include "wx/cshelp.h"
+#include "wx/helphtml.h"
+#ifdef __WXMSW__
+    #include "wx/msw/helpchm.h"
+#else
+    #include "wx/html/helpctrl.h"
+#endif
 
-#include <wx/ogl/ogl.h>
-#include <wx/ogl/canvas.h>
+#include "wx/ogl/ogl.h"
+#include "wx/ogl/canvas.h"
 #include "shapes.h"
 
 class csEditorToolPalette;
@@ -60,7 +67,7 @@ public:
     void CreateDiagramToolBar(wxFrame* parent);
 
     wxMDIChildFrame *CreateChildFrame(wxDocument *doc, wxView *view, wxMenu** editMenu);
-    csCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+    csCanvas *CreateCanvas(wxView *view, wxMDIChildFrame *parent);
 
     // Fill out the project tree control
     void FillProjectTreeCtrl();
@@ -81,7 +88,7 @@ public:
     wxMenu* GetShapeEditMenu() const { return m_shapeEditMenu; }
     wxDiagramClipboard& GetDiagramClipboard() const { return (wxDiagramClipboard&) m_diagramClipboard; }
     wxDocManager* GetDocManager() const { return m_docManager; }
-    wxHelpController& GetHelpController() const { return (wxHelpController&) m_helpController; }
+    wxHelpControllerBase* GetHelpController() const { return m_helpController; }
 
     int GetGridStyle() const { return m_gridStyle; }
     void SetGridStyle(int style) { m_gridStyle = style; }
@@ -112,7 +119,7 @@ protected:
     csDiagramClipboard      m_diagramClipboard;
 
     // Help instance
-    wxHelpController        m_helpController;
+    wxHelpControllerBase*   m_helpController;
 };
 
 DECLARE_APP(csApp)
@@ -168,4 +175,3 @@ DECLARE_APP(csApp)
 
 #endif
   // _STUDIO_STUDIO_H_
-