SetSizeHints fix

[wxWidgets.git] / samples / help / demo.cpp

diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index a593c3e810e82883fe7a4911d85ca8b5d33c5264..22561060124c10abc5204e0ad1ee3cbb9da91ff8 100644 (file)
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -425,9 +425,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
+#if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar();
     SetStatusText(_T("Welcome to wxWidgets!"));
+#endif // wxUSE_STATUSBAR
 
     // now create some controls
 
@@ -595,7 +597,7 @@ void MyFrame::ShowHelp(int commandId, wxHelpControllerBase& helpController)
        {
           wxString key = wxGetTextFromUser(_T("Search for?"),
                                            _T("Search help for keyword"),
-                                           _T(""),
+                                           wxEmptyString,
                                            this);
           if(! key.IsEmpty())
              helpController.KeywordSearch(key);
@@ -666,7 +668,6 @@ MyModalDialog::MyModalDialog(wxWindow *parent)
     sizerTop->Add(text, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     sizerTop->Add(sizerRow, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    SetAutoLayout(true);
     SetSizer(sizerTop);
 
     sizerTop->SetSizeHints(this);