Added zip file containing DSW files for samples and demos

[wxWidgets.git] / samples / docvwmdi / view.cpp

diff --git a/samples/docvwmdi/view.cpp b/samples/docvwmdi/view.cpp
index 9dd8bbbb79b9bbf2ef8ffcdf880a4bffe46a3a18..5a41fff149c4c951edd78799b584cbd4e72400d3 100644 (file)
--- a/samples/docvwmdi/view.cpp
+++ b/samples/docvwmdi/view.cpp
@@ -24,8 +24,8 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#if !USE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_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"
 #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);
     // 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);
 #endif
     frame->Show(TRUE);

+    Activate(TRUE);

 
     return 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);
   // 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);
 #endif
 
   frame->Show(TRUE);


@@ -188,7 +189,7 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 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;
  wxScrolledWindow(frame, -1, pos, size, style)
 {
   view = v;


@@ -255,7 +256,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 }
 
 // Define a constructor for my text subwindow
 }
 
 // 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;
  wxTextCtrl(frame, -1, "", pos, size, style)
 {
   view = v;