wxUniversal compilation fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/ogl/studio/studio.cpp b/contrib/samples/ogl/studio/studio.cpp
index 48c0b44fd1b4ff982d75db3a40329d6bc95e899c..ce7ca8b60906ecb2817ca559f15b676597a2aff5 100644 (file)
--- a/contrib/samples/ogl/studio/studio.cpp
+++ b/contrib/samples/ogl/studio/studio.cpp
@@ -288,7 +288,7 @@ wxMDIChildFrame *csApp::CreateChildFrame(wxDocument *doc, wxView *view, wxMenu**
 }
 
 // Creates a canvas. Called by OnInit as a child of the main window
-csCanvas *csApp::CreateCanvas(wxView *view, wxFrame *parent)
+csCanvas *csApp::CreateCanvas(wxView *view, wxMDIChildFrame *parent)
 {
   int width, height;
   parent->GetClientSize(&width, &height);

diff --git a/contrib/samples/ogl/studio/studio.h b/contrib/samples/ogl/studio/studio.h
index 599f693aa51e01215f942ed45575f667ea4fc113..b7397303562b8f298a5f4d360fe967c689b1c6c5 100644 (file)
--- a/contrib/samples/ogl/studio/studio.h
+++ b/contrib/samples/ogl/studio/studio.h
@@ -60,7 +60,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();

diff --git a/contrib/samples/ogl/studio/view.h b/contrib/samples/ogl/studio/view.h
index 7b5065aa5b9e70011397626f6d81ee362f461c85..9b15ec43457e7339aa787c32faa4744c66c78e8e 100644 (file)
--- a/contrib/samples/ogl/studio/view.h
+++ b/contrib/samples/ogl/studio/view.h
@@ -132,7 +132,7 @@ class csDiagramView: public wxView
 DECLARE_EVENT_TABLE()
 
 public:
-  wxFrame*      frame;
+  wxMDIChildFrame*      frame;
   csCanvas*     canvas;
   wxList        m_selections;
 };