X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..39178e3bdf1944bb73ee64586ba2390c505bee24:/samples/docvwmdi/view.cpp?ds=sidebyside

diff --git a/samples/docvwmdi/view.cpp b/samples/docvwmdi/view.cpp
index ab94cf73c7..5a41fff149 100644
--- a/samples/docvwmdi/view.cpp
+++ b/samples/docvwmdi/view.cpp
@@ -24,8 +24,8 @@
 #include "wx/wx.h"
 #endif
 
-#if !USE_DOC_VIEW_ARCHITECTURE
-#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#if !wxUSE_DOC_VIEW_ARCHITECTURE
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
 #endif
 
 #include "docview.h"
@@ -54,9 +54,10 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
     // X seems to require a forced resize
     int x, y;
     frame->GetSize(&x, &y);
-    frame->SetSize(x, y);
+    frame->SetSize(-1, -1, x, y);
 #endif
     frame->Show(TRUE);
+    Activate(TRUE);
 
     return TRUE;
 }
@@ -146,7 +147,7 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
   // X seems to require a forced resize
   int x, y;
   frame->GetSize(&x, &y);
-  frame->SetSize(x, y);
+  frame->SetSize(-1, -1, x, y);
 #endif
 
   frame->Show(TRUE);
@@ -188,7 +189,7 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 END_EVENT_TABLE()
 
 // Define a constructor for my canvas
-MyCanvas::MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style):
+MyCanvas::MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style):
  wxScrolledWindow(frame, -1, pos, size, style)
 {
   view = v;
@@ -255,7 +256,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 }
 
 // Define a constructor for my text subwindow
-MyTextWindow::MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style):
+MyTextWindow::MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style):
  wxTextCtrl(frame, -1, "", pos, size, style)
 {
   view = v;