Added GetBitmap, GetIcon to wx.ImageList.

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

diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index 47fe984393cd3b6b4a5ddf63704a90b77b83a7a0..2a0b0bc08274a8d1d5a7e4dc27433c33b7a3bd12 100644 (file)
--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@@ -220,8 +220,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     SetMenuBar(menuBar);
 #endif // wxUSE_MENUS
 
+#if wxUSE_STATUSBAR
     // create status bar
     CreateStatusBar();
+#endif // wxUSE_STATUSBAR
 
     // create child controls
 
@@ -293,10 +295,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
                                              (unsigned long)nDpy));
     }
 
-    wxNotebookSizer *notebookSizer = new wxNotebookSizer(m_notebook);
-    panel->SetSizer(notebookSizer);
-    notebookSizer->Fit(this);
-    notebookSizer->SetSizeHints(this);
+    wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
+    sizer->Add(m_notebook, 1, wxEXPAND);
+    panel->SetSizer(sizer);
+    sizer->Fit(this);
+    sizer->SetSizeHints(this);
 }
 
 wxString MyFrame::VideoModeToText(const wxVideoMode& mode)
@@ -335,7 +338,9 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnFromPoint(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_STATUSBAR
     SetStatusText(_T("Press the mouse anywhere..."));
+#endif // wxUSE_STATUSBAR
 
     CaptureMouse();
 }