Fixes for wxUSE_STATUSBAR.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/animate/anitest.cpp b/contrib/samples/animate/anitest.cpp
index f03f8875b102c9badadebc674ad3c85c7931b688..b3f7d2d2e6baf76d56d4f8d9b96a63854f6391dc 100644 (file)
--- a/contrib/samples/animate/anitest.cpp
+++ b/contrib/samples/animate/anitest.cpp
@@ -93,7 +93,9 @@ bool MyApp::OnInit()
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 
+#if wxUSE_STATUSBAR
     frame->CreateStatusBar();
+#endif // wxUSE_STATUSBAR
 
     frame->Show(TRUE);
 

diff --git a/contrib/samples/deprecated/resource/resource.cpp b/contrib/samples/deprecated/resource/resource.cpp
index 4aaf51eca0f18b6828a5e355e3e4f92d5345ba01..49ae380361bde20f4f108fc854fa2086374bfef1 100644 (file)
--- a/contrib/samples/deprecated/resource/resource.cpp
+++ b/contrib/samples/deprecated/resource/resource.cpp
@@ -107,8 +107,10 @@ bool MyApp::OnInit(void)
                          wxT("wxWidgets Resource Sample"),
                          wxPoint(-1, -1), wxSize(300, 250) );
 
+#if wxUSE_STATUSBAR
     // Give it a status line
     frame->CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
 
     wxMenuBar *menu_bar = wxResourceCreateMenuBar(wxT("menu1"));
 

diff --git a/contrib/samples/deprecated/treelay/treelay.cpp b/contrib/samples/deprecated/treelay/treelay.cpp
index fd8213832e2bc0a4a123b441bcb969ca063afebe..8f9f1f46a2f00ab0dc216858a6bfb5d139058ebc 100644 (file)
--- a/contrib/samples/deprecated/treelay/treelay.cpp
+++ b/contrib/samples/deprecated/treelay/treelay.cpp
@@ -43,8 +43,10 @@ bool MyApp::OnInit()
   // Create the main frame window
   MyFrame* frame = new MyFrame(NULL, _T("Tree Test"), wxPoint(-1, -1), wxSize(400, 550));
 
+#if wxUSE_STATUSBAR
   // Give it a status line
   frame->CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
 
   // Give it an icon
 #ifdef __WINDOWS__
@@ -85,7 +87,9 @@ bool MyApp::OnInit()
 
   frame->Show(TRUE);
 
+#if wxUSE_STATUSBAR
   frame->SetStatusText(_T("Hello, tree!"));
+#endif // wxUSE_STATUSBAR
 
   // Return the main frame window
   return TRUE;

diff --git a/contrib/samples/fl/fl_demo1.cpp b/contrib/samples/fl/fl_demo1.cpp
index 9ba3f3bf2a3b9d2f79a2e10614b8405234222160..e0c08532d135e381c1153371ae5eb56b5b74ce2d 100644 (file)
--- a/contrib/samples/fl/fl_demo1.cpp
+++ b/contrib/samples/fl/fl_demo1.cpp
@@ -69,7 +69,9 @@ bool MyApp::OnInit(void)
     
     frame->SetMenuBar(menu_bar);
     
+#if wxUSE_STATUSBAR
     frame->CreateStatusBar(3);
+#endif // wxUSE_STATUSBAR
     
     frame->Show(true);
     

diff --git a/contrib/samples/fl/fl_demo2.cpp b/contrib/samples/fl/fl_demo2.cpp
index dafbaa61ccee7af57179dbe75505ff369ce6e7c0..4c68a841012310653d6652e9042efd3750a40751 100644 (file)
--- a/contrib/samples/fl/fl_demo2.cpp
+++ b/contrib/samples/fl/fl_demo2.cpp
@@ -96,7 +96,9 @@ bool MyApp::OnInit(void)
     menu_bar->Append(file_menu,   _("&File"));
     menu_bar->Append(active_menu, _("Active &Layout"));
 
+#if wxUSE_STATUSBAR
     frame->CreateStatusBar(3);
+#endif // wxUSE_STATUSBAR
 
     frame->SetMenuBar(menu_bar);
 

diff --git a/contrib/samples/fl/fl_sample1.cpp b/contrib/samples/fl/fl_sample1.cpp
index 6265e8ae26d6fff366762865bc9a86b7838e0cda..9ec4cd35aac3cadb671ce365d425500a862dc765 100644 (file)
--- a/contrib/samples/fl/fl_sample1.cpp
+++ b/contrib/samples/fl/fl_sample1.cpp
@@ -83,7 +83,9 @@ bool MyApp::OnInit(void)
     
     menu_bar->Append(file_menu, _("&File"));
     
+#if wxUSE_STATUSBAR
     frame->CreateStatusBar(3);
+#endif // wxUSE_STATUSBAR
     frame->SetMenuBar(menu_bar);
     
     frame->Show(true);

diff --git a/contrib/samples/fl/fl_sample2.cpp b/contrib/samples/fl/fl_sample2.cpp
index 69e7bcb6d0d80931b2889e26ced4090911c1de8d..d2dae82c744e71a74b0ca22bc6408ea2f136c217 100644 (file)
--- a/contrib/samples/fl/fl_sample2.cpp
+++ b/contrib/samples/fl/fl_sample2.cpp
@@ -84,7 +84,9 @@ bool MyApp::OnInit(void)
     
     menu_bar->Append(file_menu, _("&File"));
     
+#if wxUSE_STATUSBAR
     frame->CreateStatusBar(3);
+#endif // wxUSE_STATUSBAR
     frame->SetMenuBar(menu_bar);
     
     frame->Show(true);

diff --git a/contrib/samples/fl/fl_sample3.cpp b/contrib/samples/fl/fl_sample3.cpp
index 1b1e8abe2355fc69d7afc991aed585c162400397..3a64a92ae5279b5fd9cb6f8eeb6192b185d9a91b 100644 (file)
--- a/contrib/samples/fl/fl_sample3.cpp
+++ b/contrib/samples/fl/fl_sample3.cpp
@@ -88,7 +88,9 @@ bool MyApp::OnInit(void)
     
     menu_bar->Append(file_menu, _("&File"));
     
+#if wxUSE_STATUSBAR
     frame->CreateStatusBar(3);
+#endif // wxUSE_STATUSBAR
     frame->SetMenuBar(menu_bar);
     
     frame->Show(true);

diff --git a/contrib/samples/gizmos/multicell/mtest.cpp b/contrib/samples/gizmos/multicell/mtest.cpp
index b3da3f73ee87fd8ef24668cf765e21d4d34837f5..1254de9926c85833e857134284654b357d38f429 100644 (file)
--- a/contrib/samples/gizmos/multicell/mtest.cpp
+++ b/contrib/samples/gizmos/multicell/mtest.cpp
@@ -66,7 +66,9 @@ bool MyApp::OnInit(void)
 MyFrame::MyFrame(int type, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
 wxFrame(frame, wxID_ANY, title, pos, size, wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL)
 {
+#if wxUSE_STATUSBAR
     CreateStatusBar(1);
+#endif // wxUSE_STATUSBAR
     sizer = NULL;
     if (type == 1)
     {

diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
index bdb509f92ae063132b3e6e311927a015072d8ca0..6d71ad5239c319b1519272021c50e58c3775dbe0 100644 (file)
--- a/contrib/samples/mmedia/mmboard.cpp
+++ b/contrib/samples/mmedia/mmboard.cpp
@@ -431,7 +431,9 @@ void MMBoardFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
     // Update misc info
     UpdateMMedInfo();
 
+#if wxUSE_STATUSBAR
     SetStatusText(selected_file, 2);
+#endif // wxUSE_STATUSBAR
 
     // Update info text
     UpdateInfoText();
@@ -469,7 +471,6 @@ void MMBoardFrame::UpdateInfoText()
 
 void MMBoardFrame::UpdateMMedInfo()
 {
-    wxString temp_string;
     MMBoardTime current, length;
 
     if (m_opened_file) {
@@ -480,10 +481,15 @@ void MMBoardFrame::UpdateMMedInfo()
         length = current;
     }
 
+#if wxUSE_STATUSBAR
     // We refresh the status bar
+    wxString temp_string;
     temp_string.Printf(wxT("%02d:%02d / %02d:%02d"), current.hours * 60 + current.minutes,
                        current.seconds, length.hours * 60 + length.minutes, length.seconds);
     SetStatusText(temp_string, 1);
+#else
+    wxUnusedVar(length);
+#endif // wxUSE_STATUSBAR
 
     // We set the slider position
     m_positionSlider->SetValue(current.hours * 3600 + current.minutes * 60 + current.seconds);

diff --git a/contrib/samples/ogl/ogledit/doc.cpp b/contrib/samples/ogl/ogledit/doc.cpp
index ad927465c74f62265d23c37f84a51dc132db11d4..331d12282b6a657e1af5cce4cce11008131283b8 100644 (file)
--- a/contrib/samples/ogl/ogledit/doc.cpp
+++ b/contrib/samples/ogl/ogledit/doc.cpp
@@ -480,7 +480,9 @@ void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
   }
   else
   {
+#if wxUSE_STATUSBAR
     wxGetApp().frame->SetStatusText(label);
+#endif // wxUSE_STATUSBAR
   }
 }
 

diff --git a/contrib/samples/ogl/ogledit/ogledit.cpp b/contrib/samples/ogl/ogledit/ogledit.cpp
index fb1507663c7e500f1949c4e09b737546a3ed2485..c0c668408f1e8513e2ce329b70cb557c1d9c4eb9 100644 (file)
--- a/contrib/samples/ogl/ogledit/ogledit.cpp
+++ b/contrib/samples/ogl/ogledit/ogledit.cpp
@@ -118,7 +118,9 @@ bool MyApp::OnInit(void)
   //// Associate the menu bar with the frame
   frame->SetMenuBar(menu_bar);
 
+#if wxUSE_STATUSBAR
   frame->CreateStatusBar(1);
+#endif // wxUSE_STATUSBAR
 
   frame->Centre(wxBOTH);
   frame->Show(true);

diff --git a/contrib/samples/ogl/studio/cspalette.cpp b/contrib/samples/ogl/studio/cspalette.cpp
index 4c2551f9e8557e65447d21d59ff8daa7cb5b1335..719afbfff5963aa3f7e7fb2d7a36b70d130e9bd4 100644 (file)
--- a/contrib/samples/ogl/studio/cspalette.cpp
+++ b/contrib/samples/ogl/studio/cspalette.cpp
@@ -72,6 +72,7 @@ bool csEditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
 
 void csEditorToolPalette::OnMouseEnter(int toolIndex)
 {
+#if wxUSE_STATUSBAR
     wxString msg = wxEmptyString;
     if (toolIndex == PALETTE_ARROW)
         msg = _T("Pointer");
@@ -82,6 +83,9 @@ void csEditorToolPalette::OnMouseEnter(int toolIndex)
             msg = symbol->GetName();
     }
     ((wxFrame*) wxGetApp().GetTopWindow())->SetStatusText(msg);
+#else
+    wxUnusedVar(toolIndex);
+#endif // wxUSE_STATUSBAR
 }
 
 void csEditorToolPalette::SetSize(int x, int y, int width, int height, int sizeFlags)

diff --git a/contrib/samples/ogl/studio/shapes.cpp b/contrib/samples/ogl/studio/shapes.cpp
index 2c2e7e72491e26c4893be15d9834cf4a18f1dcac..da69c5b64c9dfc956fa12445000d4b0ae5287ee0 100644 (file)
--- a/contrib/samples/ogl/studio/shapes.cpp
+++ b/contrib/samples/ogl/studio/shapes.cpp
@@ -159,7 +159,9 @@ void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
   }
   else
   {
+#if wxUSE_STATUSBAR
     ((wxFrame*)wxGetApp().GetTopWindow())->SetStatusText(m_label);
+#endif // wxUSE_STATUSBAR
   }
 }
 

diff --git a/contrib/samples/ogl/studio/studio.cpp b/contrib/samples/ogl/studio/studio.cpp
index 6eacff447e94875e48c7efc9555d182c30d74e8f..492f1ad4908791ffe2921889923a9a7a43c057e7 100644 (file)
--- a/contrib/samples/ogl/studio/studio.cpp
+++ b/contrib/samples/ogl/studio/studio.cpp
@@ -170,7 +170,9 @@ bool csApp::OnInit(void)
   wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
   m_docManager->FileHistoryLoad(config);
 
+#if wxUSE_STATUSBAR
   frame->CreateStatusBar();
+#endif // wxUSE_STATUSBAR
 
   // The ordering of these is important for layout purposes
   CreateDiagramToolBar(frame);

diff --git a/contrib/samples/plot/plot.cpp b/contrib/samples/plot/plot.cpp
index 625891976d15a57504f2a65c769222bbbeafe67b..365eb648e1f31abfa625eba9a9dbe1867cedcfe1 100644 (file)
--- a/contrib/samples/plot/plot.cpp
+++ b/contrib/samples/plot/plot.cpp
@@ -115,9 +115,11 @@ MyFrame::MyFrame()
 
     SetMenuBar( menu_bar );
 
+#if wxUSE_STATUSBAR
     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );
+#endif // wxUSE_STATUSBAR
 
     m_plot = new wxPlotWindow( this, -1, wxPoint(0,0), wxSize(100,100), wxSUNKEN_BORDER | wxPLOT_DEFAULT );
     m_plot->SetUnitsPerValue( 0.01 );

diff --git a/contrib/samples/svg/svgtest.cpp b/contrib/samples/svg/svgtest.cpp
index 45de9ffca653a9c311a42a8104222a9d3174f249..a20c1562d70a5e3eaf6b97d1458aeb85d5745875 100644 (file)
--- a/contrib/samples/svg/svgtest.cpp
+++ b/contrib/samples/svg/svgtest.cpp
@@ -179,9 +179,11 @@ bool MyApp::OnInit()
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 
+#if wxUSE_STATUSBAR
     frame->CreateStatusBar();
+#endif // wxUSE_STATUSBAR
 
-    frame->Show(TRUE);
+    frame->Show(true);
 
     SetTopWindow(frame);
 
@@ -391,7 +393,9 @@ wxSUNKEN_BORDER|wxVSCROLL|wxHSCROLL)
 void MyCanvas::OnDraw(wxDC& dc)
 {
     // vars to use ...
+#if wxUSE_STATUSBAR
     wxString s ;
+#endif // wxUSE_STATUSBAR
     wxPen wP ;
     wxBrush wB ;
     wxPoint points[6];
@@ -417,7 +421,9 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.DrawPoint (25,15) ;
             dc.DrawLine(50, 30, 200, 30);
             dc.DrawSpline(50, 200, 50, 100, 200, 10);
+#if wxUSE_STATUSBAR
             s = wxT("Green Cross, Cyan Line and spline");
+#endif // wxUSE_STATUSBAR
             break ;
 
         case 1:
@@ -440,7 +446,9 @@ void MyCanvas::OnDraw(wxDC& dc)
 
             dc.DrawPolygon(5, points);
             dc.DrawLines (6, points, 160);
+#if wxUSE_STATUSBAR
             s = wxT("Blue rectangle, red edge, clear rounded rectangle, gold ellipse, gold and clear stars");
+#endif // wxUSE_STATUSBAR
             break ;
 
         case 2:
@@ -460,7 +468,9 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.SetFont(wF);
             dc.SetTextForeground (wC) ;
             dc.DrawText(wxT("This is a Times-style string"), 50, 60);
+#if wxUSE_STATUSBAR
             s = wxT("Swiss, Times text; red text, rotated and colored orange");
+#endif // wxUSE_STATUSBAR
             break ;
 
         case 3 :
@@ -494,7 +504,9 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.DrawEllipticArc(300, 50,200,100,90.0,145.0) ;
             dc.DrawEllipticArc(300,100,200,100,90.0,345.0) ;
 
+#if wxUSE_STATUSBAR
             s = wxT("This is an arc test page");
+#endif // wxUSE_STATUSBAR
             break ;
 
         case 4:
@@ -502,7 +514,9 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.SetBrush (wxBrush (_T("SALMON"),wxTRANSPARENT));
             dc.DrawCheckMark ( 80,50,75,75);
             dc.DrawRectangle ( 80,50,75,75);
+#if wxUSE_STATUSBAR
             s = wxT("Two check marks");
+#endif // wxUSE_STATUSBAR
             break ;
 
         case 5:
@@ -532,17 +546,23 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.DrawLine(0, 0, 200, 200);
             dc.DrawLine(200, 0, 0, 200);
             dc.DrawText(wxT("This is an 18pt string in MapMode"), 50, 60); 
+#if wxUSE_STATUSBAR
             s = wxT("Scaling test page");
+#endif // wxUSE_STATUSBAR
             break ;
 
         case 6:
             dc.DrawIcon( wxIcon(mondrian_xpm), 10, 10 );
             dc.DrawBitmap ( wxBitmap(svgbitmap_xpm), 50,15);
+#if wxUSE_STATUSBAR
             s = wxT("Icon and Bitmap ");
+#endif // wxUSE_STATUSBAR
             break ;
 
     }
+#if wxUSE_STATUSBAR
     m_child->SetStatusText(s);
+#endif // wxUSE_STATUSBAR
 }
 
 
@@ -559,8 +579,10 @@ const long style)
 {
 
     m_frame = (MyFrame *) parent ;
+#if wxUSE_STATUSBAR
     CreateStatusBar();
     SetStatusText(title);    
+#endif // wxUSE_STATUSBAR
 
     int w, h ;
     GetClientSize ( &w, &h );

diff --git a/contrib/samples/xrc/myframe.cpp b/contrib/samples/xrc/myframe.cpp
index cfab7d39f97c3a5f2950f5044da7f10d411ec8b0..577997cc1e2ab0e65af244cd4c07e878f8e1e0e1 100644 (file)
--- a/contrib/samples/xrc/myframe.cpp
+++ b/contrib/samples/xrc/myframe.cpp
@@ -122,12 +122,14 @@ MyFrame::MyFrame(wxWindow* parent)
     // needs to be all in one step.
     SetToolBar(wxXmlResource::Get()->LoadToolBar(this, wxT("main_toolbar")));
 
+#if wxUSE_STATUSBAR
     // Give the frame a optional statusbar. The '1' just means one field.
     // A gripsizer will automatically get put on into the corner, if that
     // is the normal OS behaviour for frames on that platform. Helptext
     // for menu items and toolbar tools will automatically get displayed
     // here.
     CreateStatusBar( 1 );
+#endif // wxUSE_STATUSBAR
 }
 
 //-----------------------------------------------------------------------------

diff --git a/contrib/utils/wxrcedit/preview.cpp b/contrib/utils/wxrcedit/preview.cpp
index 21f3668cf182ee5a553c4dca37ccedd4e35fadd7..66ffaf3865437fc09f73c6c52d8b4c25f76d7215 100644 (file)
--- a/contrib/utils/wxrcedit/preview.cpp
+++ b/contrib/utils/wxrcedit/preview.cpp
@@ -90,7 +90,9 @@ PreviewFrame::PreviewFrame()
     m_ScrollWin->SetBackgroundColour(_T("light steel blue"));
     m_Splitter->SplitHorizontally(m_ScrollWin, m_LogCtrl, cfg->Read(_T("previewframe_sash"), 300));
 
+#if wxUSE_STATUSBAR
     CreateStatusBar();
+#endif // wxUSE_STATUSBAR
 
 #ifdef __WXMSW__
     SendSizeEvent(); // force resize for WXMSW

diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index 45de9ffca653a9c311a42a8104222a9d3174f249..a20c1562d70a5e3eaf6b97d1458aeb85d5745875 100644 (file)
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -179,9 +179,11 @@ bool MyApp::OnInit()
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 
+#if wxUSE_STATUSBAR
     frame->CreateStatusBar();
+#endif // wxUSE_STATUSBAR
 
-    frame->Show(TRUE);
+    frame->Show(true);
 
     SetTopWindow(frame);
 
@@ -391,7 +393,9 @@ wxSUNKEN_BORDER|wxVSCROLL|wxHSCROLL)
 void MyCanvas::OnDraw(wxDC& dc)
 {
     // vars to use ...
+#if wxUSE_STATUSBAR
     wxString s ;
+#endif // wxUSE_STATUSBAR
     wxPen wP ;
     wxBrush wB ;
     wxPoint points[6];
@@ -417,7 +421,9 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.DrawPoint (25,15) ;
             dc.DrawLine(50, 30, 200, 30);
             dc.DrawSpline(50, 200, 50, 100, 200, 10);
+#if wxUSE_STATUSBAR
             s = wxT("Green Cross, Cyan Line and spline");
+#endif // wxUSE_STATUSBAR
             break ;
 
         case 1:
@@ -440,7 +446,9 @@ void MyCanvas::OnDraw(wxDC& dc)
 
             dc.DrawPolygon(5, points);
             dc.DrawLines (6, points, 160);
+#if wxUSE_STATUSBAR
             s = wxT("Blue rectangle, red edge, clear rounded rectangle, gold ellipse, gold and clear stars");
+#endif // wxUSE_STATUSBAR
             break ;
 
         case 2:
@@ -460,7 +468,9 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.SetFont(wF);
             dc.SetTextForeground (wC) ;
             dc.DrawText(wxT("This is a Times-style string"), 50, 60);
+#if wxUSE_STATUSBAR
             s = wxT("Swiss, Times text; red text, rotated and colored orange");
+#endif // wxUSE_STATUSBAR
             break ;
 
         case 3 :
@@ -494,7 +504,9 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.DrawEllipticArc(300, 50,200,100,90.0,145.0) ;
             dc.DrawEllipticArc(300,100,200,100,90.0,345.0) ;
 
+#if wxUSE_STATUSBAR
             s = wxT("This is an arc test page");
+#endif // wxUSE_STATUSBAR
             break ;
 
         case 4:
@@ -502,7 +514,9 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.SetBrush (wxBrush (_T("SALMON"),wxTRANSPARENT));
             dc.DrawCheckMark ( 80,50,75,75);
             dc.DrawRectangle ( 80,50,75,75);
+#if wxUSE_STATUSBAR
             s = wxT("Two check marks");
+#endif // wxUSE_STATUSBAR
             break ;
 
         case 5:
@@ -532,17 +546,23 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.DrawLine(0, 0, 200, 200);
             dc.DrawLine(200, 0, 0, 200);
             dc.DrawText(wxT("This is an 18pt string in MapMode"), 50, 60); 
+#if wxUSE_STATUSBAR
             s = wxT("Scaling test page");
+#endif // wxUSE_STATUSBAR
             break ;
 
         case 6:
             dc.DrawIcon( wxIcon(mondrian_xpm), 10, 10 );
             dc.DrawBitmap ( wxBitmap(svgbitmap_xpm), 50,15);
+#if wxUSE_STATUSBAR
             s = wxT("Icon and Bitmap ");
+#endif // wxUSE_STATUSBAR
             break ;
 
     }
+#if wxUSE_STATUSBAR
     m_child->SetStatusText(s);
+#endif // wxUSE_STATUSBAR
 }
 
 
@@ -559,8 +579,10 @@ const long style)
 {
 
     m_frame = (MyFrame *) parent ;
+#if wxUSE_STATUSBAR
     CreateStatusBar();
     SetStatusText(title);    
+#endif // wxUSE_STATUSBAR
 
     int w, h ;
     GetClientSize ( &w, &h );

diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp
index cfab7d39f97c3a5f2950f5044da7f10d411ec8b0..577997cc1e2ab0e65af244cd4c07e878f8e1e0e1 100644 (file)
--- a/samples/xrc/myframe.cpp
+++ b/samples/xrc/myframe.cpp
@@ -122,12 +122,14 @@ MyFrame::MyFrame(wxWindow* parent)
     // needs to be all in one step.
     SetToolBar(wxXmlResource::Get()->LoadToolBar(this, wxT("main_toolbar")));
 
+#if wxUSE_STATUSBAR
     // Give the frame a optional statusbar. The '1' just means one field.
     // A gripsizer will automatically get put on into the corner, if that
     // is the normal OS behaviour for frames on that platform. Helptext
     // for menu items and toolbar tools will automatically get displayed
     // here.
     CreateStatusBar( 1 );
+#endif // wxUSE_STATUSBAR
 }
 
 //-----------------------------------------------------------------------------

diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp
index cb090e8ccae0654f67204347b168710521ad29a9..d214233eb0aa5f922b553d35895d6f7af6d8d04a 100644 (file)
--- a/utils/configtool/src/mainframe.cpp
+++ b/utils/configtool/src/mainframe.cpp
@@ -140,7 +140,9 @@ ctMainFrame::ctMainFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id,
 
     SetIcon(wxIcon(wxconfigtool_xpm));
 
+#if wxUSE_STATUSBAR
     CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
 
     wxMenuBar* menuBar = CreateMenuBar();
     SetMenuBar(menuBar);

diff --git a/utils/emulator/src/emulator.cpp b/utils/emulator/src/emulator.cpp
index 7b8e35d6eac9b178909104dc27fd7807e311af20..4e44d87096aa3a0b124e4284e5ee7f83631f5793 100644 (file)
--- a/utils/emulator/src/emulator.cpp
+++ b/utils/emulator/src/emulator.cpp
@@ -180,12 +180,14 @@ bool wxEmulatorApp::OnInit()
     wxEmulatorFrame *frame = new wxEmulatorFrame(_T("wxEmulator"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
+#if wxUSE_STATUSBAR
     frame->SetStatusText(m_emulatorInfo.m_emulatorTitle, 0);
 
     wxString sizeStr;
     sizeStr.Printf(wxT("Screen: %dx%d"), (int) m_emulatorInfo.m_emulatorScreenSize.x,
             (int) m_emulatorInfo.m_emulatorScreenSize.y);
     frame->SetStatusText(sizeStr, 1);
+#endif // wxUSE_STATUSBAR
 
     m_containerWindow = new wxEmulatorContainer(frame, wxID_ANY);