Sample update - wxTE_AUTO_URL from Mart R. [patch 1126182]

[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 b7397303562b8f298a5f4d360fe967c689b1c6c5..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>


@@ -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)