added wxDIB(HBITMAP) ctor and corresponding Create(); made GetData() return uchar...

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

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index ce576a3c1d3b7ac74697c5b22d13be2007f1d743..1ee69f89e513cb3e7d90626750849dc153f5277a 100644 (file)
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -66,7 +66,7 @@ END_EVENT_TABLE()
 
 // Define my frame constructor
 MyFrame::MyFrame()
-       : wxFrame(NULL, wxID_ANY, _T("wxWindows Layout Demo"),
+       : wxFrame(NULL, wxID_ANY, _T("wxWidgets Layout Demo"),
                  wxDefaultPosition, wxDefaultSize,
                  wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
@@ -91,9 +91,10 @@ MyFrame::MyFrame()
   // Associate the menu bar with the frame
   SetMenuBar(menu_bar);
 
+#if wxUSE_STATUSBAR
   CreateStatusBar(2);
-  SetStatusText(_T("wxWindows layout demo"));
-
+  SetStatusText(_T("wxWidgets layout demo"));
+#endif // wxUSE_STATUSBAR
 
   // we want to get a dialog that is stretchable because it
   // has a text ctrl in the middle. at the bottom, we have
@@ -201,7 +202,7 @@ void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-    (void)wxMessageBox(_T("wxWindows GUI library layout demo\n"),
+    (void)wxMessageBox(_T("wxWidgets GUI library layout demo\n"),
             _T("About Layout Demo"), wxOK|wxICON_INFORMATION);
 }
 
@@ -326,8 +327,7 @@ MySizerDialog::MySizerDialog(wxWindow *parent, const wxChar *title)
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     wxNotebook *notebook = new wxNotebook( this, wxID_ANY );
-    wxNotebookSizer *nbs = new wxNotebookSizer( notebook );
-    topsizer->Add( nbs, 1, wxGROW );
+    topsizer->Add( notebook, 1, wxGROW );
 
     wxButton *button = new wxButton( this, wxID_OK, _T("OK") );
     topsizer->Add( button, 0, wxALIGN_RIGHT | wxALL, 10 );