Wrong #pragma interface/implementation warning fixes.

[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 0104a164561d319b3d59f8ff71af08ba98c559d4..7d36cf0a4fbaa3945180c463675c767aa1ee9630 100644 (file)
--- a/contrib/samples/ogl/studio/studio.h
+++ b/contrib/samples/ogl/studio/studio.h
@@ -14,6 +14,13 @@
 
 #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>


@@ -34,7 +41,7 @@ class csFrame;
 // Define a new application
 class csApp: public wxApp
 {
 // Define a new application
 class csApp: public wxApp
 {

-    friend csFrame;
+    friend class csFrame;

 public:
     csApp();
     ~csApp();
 public:
     csApp();
     ~csApp();


@@ -60,7 +67,7 @@ public:
     void CreateDiagramToolBar(wxFrame* parent);
 
     wxMDIChildFrame *CreateChildFrame(wxDocument *doc, wxView *view, wxMenu** editMenu);
     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();
 
     // 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; }
     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; }
 
     int GetGridStyle() const { return m_gridStyle; }
     void SetGridStyle(int style) { m_gridStyle = style; }


@@ -112,7 +119,7 @@ protected:
     csDiagramClipboard      m_diagramClipboard;
 
     // Help instance
     csDiagramClipboard      m_diagramClipboard;
 
     // Help instance

-    wxHelpController        m_helpController;
+    wxHelpControllerBase*   m_helpController;

 };
 
 DECLARE_APP(csApp)
 };
 
 DECLARE_APP(csApp)