fix sizing of extra control

[wxWidgets.git] / samples / mdi / mdi.cpp

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 18e040016398e2446180fd831470430d8baa030e..b06f1bf25762fb2ad53beb29f1d34fa6defcb63f 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -267,11 +267,6 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     subframe->SetMenuBar(menu_bar);
 #endif // wxUSE_MENUS
 
     subframe->SetMenuBar(menu_bar);
 #endif // wxUSE_MENUS
 

-#if wxUSE_STATUSBAR
-    subframe->CreateStatusBar();
-    subframe->SetStatusText(title);
-#endif // wxUSE_STATUSBAR
-

     int width, height;
     subframe->GetClientSize(&width, &height);
     MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));
     int width, height;
     subframe->GetClientSize(&width, &height);
     MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));


@@ -521,8 +516,13 @@ void MyChild::OnPaste(wxCommandEvent& WXUNUSED(event))
 {
     wxClipboardLocker lock;
     wxTextDataObject data;
 {
     wxClipboardLocker lock;
     wxTextDataObject data;

-    canvas->SetText(wxTheClipboard->GetData(data) ? data.GetText().c_str()
-                                                  : _T("No text on clipboard"));
+    canvas->SetText(
+        (
+            wxTheClipboard->GetData(data) ? 
+            data.GetText() : 
+            wxString("No text on clipboard")
+        ).c_str()
+    );

 }
 
 void MyChild::OnUpdatePaste(wxUpdateUIEvent& event)
 }
 
 void MyChild::OnUpdatePaste(wxUpdateUIEvent& event)