Fixes for wxUSE_STATUSBAR.

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

diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp
index 2908746b32640bc6fdbfbab9cccdd0473d4757bb..e075f5a4bf7185b3b63000d3c10da77f64fee7b2 100644 (file)
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@@ -225,9 +225,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     
     m_canvas = new MyCanvas(this);
 
     
     m_canvas = new MyCanvas(this);
 

+#if wxUSE_STATUSBAR

     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
     SetStatusText(_T("Welcome to wxWidgets!"));
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
     SetStatusText(_T("Welcome to wxWidgets!"));

+#endif // wxUSE_STATUSBAR

 }
 
 
 }
 
 


@@ -385,15 +387,16 @@ void MyCanvas::ChangeSize()
     free(m_text);
     m_text = (wxChar *)calloc(m_xChars * m_yChars, sizeof(wxChar));
 
     free(m_text);
     m_text = (wxChar *)calloc(m_xChars * m_yChars, sizeof(wxChar));
 

+#if wxUSE_STATUSBAR

     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
 
     if ( frame && frame->GetStatusBar() )
     {
         wxString msg;
         msg.Printf(_T("Panel size is (%d, %d)"), m_xChars, m_yChars);
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
 
     if ( frame && frame->GetStatusBar() )
     {
         wxString msg;
         msg.Printf(_T("Panel size is (%d, %d)"), m_xChars, m_yChars);

-

         frame->SetStatusText(msg, 1);
     }
         frame->SetStatusText(msg, 1);
     }

+#endif // wxUSE_STATUSBAR

 }
 
 // NB: this method is horrible inefficient especially because the caret
 }
 
 // NB: this method is horrible inefficient especially because the caret

diff --git a/samples/checklst/checklst.cpp b/samples/checklst/checklst.cpp
index bd844baa0418140dfca2d9ce0405fa777c16334a..6b584352fb2a0114ffbea8fe9e64b2d83cb858c8 100644 (file)
--- a/samples/checklst/checklst.cpp
+++ b/samples/checklst/checklst.cpp
@@ -138,11 +138,13 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
                                      int x, int y, int w, int h)
                  : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
                                      int x, int y, int w, int h)
                  : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {

+#if wxUSE_STATUSBAR

     // create the status line
     const int widths[] = { -1, 60 };
     CreateStatusBar(2);
     SetStatusWidths(2, widths);
     wxLogStatus(this, _T("no selection"));
     // create the status line
     const int widths[] = { -1, 60 };
     CreateStatusBar(2);
     SetStatusWidths(2, widths);
     wxLogStatus(this, _T("no selection"));

+#endif // wxUSE_STATUSBAR

 
     // Make a menubar
     // --------------
 
     // Make a menubar
     // --------------

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index 40fd36a672c61f890f2fd651fc3d4d784aca25f1..ba142b25b8431f5aafe4da070927171d3c6623f9 100644 (file)
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -159,7 +159,9 @@ MyFrame::MyFrame()
   menu_bar->Append(file_menu, _T("&File"));
   SetMenuBar(menu_bar);
 
   menu_bar->Append(file_menu, _T("&File"));
   SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

   CreateStatusBar();
   CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
   // child controls
   wxPanel *panel = new wxPanel(this);
 
   // child controls
   wxPanel *panel = new wxPanel(this);

diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp
index 9e85641a9c826b1250d6b55add5114f9e44d31ad..775527ec30b7c33f6e0885ddebfa66fe730e1bf4 100644 (file)
--- a/samples/dialup/nettest.cpp
+++ b/samples/dialup/nettest.cpp
@@ -178,7 +178,9 @@ bool MyApp::OnInit()
         return false;
     }
 
         return false;
     }
 

+#if wxUSE_STATUSBAR

     frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? _T("LAN") : _T("No LAN"), 2);
     frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? _T("LAN") : _T("No LAN"), 2);

+#endif // wxUSE_STATUSBAR

 
     return true;
 }
 
     return true;
 }


@@ -238,10 +240,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 

+#if wxUSE_STATUSBAR

     // create status bar and fill the LAN field
     CreateStatusBar(3);
     static const int widths[3] = { -1, 100, 60 };
     SetStatusWidths(3, widths);
     // create status bar and fill the LAN field
     CreateStatusBar(3);
     static const int widths[3] = { -1, 100, 60 };
     SetStatusWidths(3, widths);

+#endif // wxUSE_STATUSBAR

 }
 
 
 }
 
 


@@ -335,6 +339,8 @@ void MyFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
     {
         s_isOnline = isOnline;
 
     {
         s_isOnline = isOnline;
 

+#if wxUSE_STATUSBAR

         SetStatusText(isOnline ? _T("Online") : _T("Offline"), 1);
         SetStatusText(isOnline ? _T("Online") : _T("Offline"), 1);

+#endif // wxUSE_STATUSBAR

     }
 }
     }
 }

diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index 22a94cf0b689c96fcbb060ae82f22ce76e90cd7c..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
 
     SetMenuBar(menuBar);
 #endif // wxUSE_MENUS
 

+#if wxUSE_STATUSBAR

     // create status bar
     CreateStatusBar();
     // create status bar
     CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
     // create child controls
 
 
     // create child controls
 


@@ -336,7 +338,9 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnFromPoint(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnFromPoint(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_STATUSBAR

     SetStatusText(_T("Press the mouse anywhere..."));
     SetStatusText(_T("Press the mouse anywhere..."));

+#endif // wxUSE_STATUSBAR

 
     CaptureMouse();
 }
 
     CaptureMouse();
 }

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 203fe373037bdc28ae8adf85826af058f441f9d1..fe72a36dcbf3be7d0f9cc9aae7afcfae67b0bffd 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -742,9 +742,18 @@ public:
 
     // override base class (pure) virtuals
     virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def)
 
     // override base class (pure) virtuals
     virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def)

-        { m_frame->SetStatusText(_T("Mouse entered the frame")); return OnDragOver(x, y, def); }
+    { 
+#if wxUSE_STATUSBAR
+        m_frame->SetStatusText(_T("Mouse entered the frame")); 
+#endif // wxUSE_STATUSBAR
+        return OnDragOver(x, y, def); 
+    }

     virtual void OnLeave()
     virtual void OnLeave()

-        { m_frame->SetStatusText(_T("Mouse left the frame")); }
+    { 
+#if wxUSE_STATUSBAR
+        m_frame->SetStatusText(_T("Mouse left the frame")); 
+#endif // wxUSE_STATUSBAR
+    }

     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
     {
         if ( !GetData() )
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
     {
         if ( !GetData() )


@@ -919,7 +928,9 @@ DnDFrame::DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h)
     // frame icon and status bar
     SetIcon(wxICON(mondrian));
 
     // frame icon and status bar
     SetIcon(wxICON(mondrian));
 

+#if wxUSE_STATUSBAR

     CreateStatusBar();
     CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
     // construct menu
     wxMenu *file_menu = new wxMenu;
 
     // construct menu
     wxMenu *file_menu = new wxMenu;


@@ -1155,8 +1166,11 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
         else if ( m_moveAllow )
             flags |= wxDrag_AllowMove;
 
         else if ( m_moveAllow )
             flags |= wxDrag_AllowMove;
 

+        wxDragResult result = source.DoDragDrop(flags);
+
+#if wxUSE_STATUSBAR

         const wxChar *pc;
         const wxChar *pc;

-        switch ( source.DoDragDrop(flags) )
+        switch ( result )

         {
             case wxDragError:   pc = _T("Error!");    break;
             case wxDragNone:    pc = _T("Nothing");   break;
         {
             case wxDragError:   pc = _T("Error!");    break;
             case wxDragNone:    pc = _T("Nothing");   break;


@@ -1167,6 +1181,9 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
         }
 
         SetStatusText(wxString(_T("Drag result: ")) + pc);
         }
 
         SetStatusText(wxString(_T("Drag result: ")) + pc);

+#else
+        wxUnusedVar(result);
+#endif // wxUSE_STATUSBAR

     }
 #endif // wxUSE_DRAG_AND_DROP
 }
     }
 #endif // wxUSE_DRAG_AND_DROP
 }


@@ -1625,7 +1642,9 @@ DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
              : wxFrame(parent, wxID_ANY, _T("Shape Frame"),
                        wxDefaultPosition, wxSize(250, 150))
 {
              : wxFrame(parent, wxID_ANY, _T("Shape Frame"),
                        wxDefaultPosition, wxSize(250, 150))
 {

+#if wxUSE_STATUSBAR

     CreateStatusBar();
     CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
     wxMenu *menuShape = new wxMenu;
     menuShape->Append(Menu_Shape_New, _T("&New default shape\tCtrl-S"));
 
     wxMenu *menuShape = new wxMenu;
     menuShape->Append(Menu_Shape_New, _T("&New default shape\tCtrl-S"));


@@ -1643,7 +1662,9 @@ DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
 
     SetMenuBar(menubar);
 
 
     SetMenuBar(menubar);
 

+#if wxUSE_STATUSBAR

     SetStatusText(_T("Press Ctrl-S to create a new shape"));
     SetStatusText(_T("Press Ctrl-S to create a new shape"));

+#endif // wxUSE_STATUSBAR

 
     SetDropTarget(new DnDShapeDropTarget(this));
 
 
     SetDropTarget(new DnDShapeDropTarget(this));
 


@@ -1689,7 +1710,9 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event)
             break;
 
         case wxDragNone:
             break;
 
         case wxDragNone:

+#if wxUSE_STATUSBAR

             SetStatusText(_T("Nothing happened"));
             SetStatusText(_T("Nothing happened"));

+#endif // wxUSE_STATUSBAR

             break;
 
         case wxDragCopy:
             break;
 
         case wxDragCopy:


@@ -1706,13 +1729,17 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event)
             break;
 
         case wxDragCancel:
             break;
 
         case wxDragCancel:

+#if wxUSE_STATUSBAR

             SetStatusText(_T("Drag and drop operation cancelled"));
             SetStatusText(_T("Drag and drop operation cancelled"));

+#endif // wxUSE_STATUSBAR

             break;
     }
 
     if ( pc )
     {
             break;
     }
 
     if ( pc )
     {

+#if wxUSE_STATUSBAR

         SetStatusText(wxString(_T("Shape successfully ")) + pc);
         SetStatusText(wxString(_T("Shape successfully ")) + pc);

+#endif // wxUSE_STATUSBAR

     }
     //else: status text already set
 }
     }
     //else: status text already set
 }


@@ -1723,9 +1750,11 @@ void DnDShapeFrame::OnDrop(wxCoord x, wxCoord y, DnDShape *shape)
 
     wxPoint pt(x, y);
 
 
     wxPoint pt(x, y);
 

+#if wxUSE_STATUSBAR

     wxString s;
     s.Printf(wxT("Shape dropped at (%d, %d)"), pt.x, pt.y);
     SetStatusText(s);
     wxString s;
     s.Printf(wxT("Shape dropped at (%d, %d)"), pt.x, pt.y);
     SetStatusText(s);

+#endif // wxUSE_STATUSBAR

 
     shape->Move(pt);
     SetShape(shape);
 
     shape->Move(pt);
     SetShape(shape);


@@ -1738,10 +1767,12 @@ void DnDShapeFrame::OnEditShape(wxCommandEvent& WXUNUSED(event))
     {
         SetShape(dlg.GetShape());
 
     {
         SetShape(dlg.GetShape());
 

+#if wxUSE_STATUSBAR

         if ( m_shape )
         {
             SetStatusText(_T("You can now drag the shape to another frame"));
         }
         if ( m_shape )
         {
             SetStatusText(_T("You can now drag the shape to another frame"));
         }

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 


@@ -1749,7 +1780,9 @@ void DnDShapeFrame::OnNewShape(wxCommandEvent& WXUNUSED(event))
 {
     SetShape(new DnDEllipticShape(wxPoint(10, 10), wxSize(80, 60), *wxRED));
 
 {
     SetShape(new DnDEllipticShape(wxPoint(10, 10), wxSize(80, 60), *wxRED));
 

+#if wxUSE_STATUSBAR

     SetStatusText(_T("You can now drag the shape to another frame"));
     SetStatusText(_T("You can now drag the shape to another frame"));

+#endif // wxUSE_STATUSBAR

 }
 
 void DnDShapeFrame::OnClearShape(wxCommandEvent& WXUNUSED(event))
 }
 
 void DnDShapeFrame::OnClearShape(wxCommandEvent& WXUNUSED(event))


@@ -1902,13 +1935,17 @@ void DnDShapeDataObject::CreateBitmap() const
 static void ShowBitmap(const wxBitmap& bitmap)
 {
     wxFrame *frame = new wxFrame(NULL, wxID_ANY, _T("Bitmap view"));
 static void ShowBitmap(const wxBitmap& bitmap)
 {
     wxFrame *frame = new wxFrame(NULL, wxID_ANY, _T("Bitmap view"));

+#if wxUSE_STATUSBAR

     frame->CreateStatusBar();
     frame->CreateStatusBar();

+#endif // wxUSE_STATUSBAR

     DnDCanvasBitmap *canvas = new DnDCanvasBitmap(frame);
     canvas->SetBitmap(bitmap);
 
     int w = bitmap.GetWidth(),
         h = bitmap.GetHeight();
     DnDCanvasBitmap *canvas = new DnDCanvasBitmap(frame);
     canvas->SetBitmap(bitmap);
 
     int w = bitmap.GetWidth(),
         h = bitmap.GetHeight();

+#if wxUSE_STATUSBAR

     frame->SetStatusText(wxString::Format(_T("%dx%d"), w, h));
     frame->SetStatusText(wxString::Format(_T("%dx%d"), w, h));

+#endif // wxUSE_STATUSBAR

 
     frame->SetClientSize(w > 100 ? 100 : w, h > 100 ? 100 : h);
     frame->Show(true);
 
     frame->SetClientSize(w > 100 ? 100 : w, h > 100 ? 100 : h);
     frame->Show(true);

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index 1141186f1a38e071a39452180996defa674b0c80..031940c99fae2f46cb204be8d38b5d23147de6d3 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -341,9 +341,11 @@ MyFrame::MyFrame()
     SetIcon(wxICON(mondrian));
     SetMenuBar( menu_bar );
     
     SetIcon(wxICON(mondrian));
     SetMenuBar( menu_bar );
     

+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );
     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );

+#endif // wxUSE_STATUSBAR

     
     m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );
 }
     
     m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );
 }

diff --git a/samples/event/event.cpp b/samples/event/event.cpp
index 8994d0a138a045b7bbea2bc6c8bf4d6b409764f7..5b21599ec9a9ca03bbbac2b9df8b05c0e5563832 100644 (file)
--- a/samples/event/event.cpp
+++ b/samples/event/event.cpp
@@ -323,15 +323,19 @@ void MyFrame::OnConnect(wxCommandEvent& event)
                 (wxEventFunction)
                 (wxCommandEventFunction)&MyFrame::OnDynamic);
 
                 (wxEventFunction)
                 (wxCommandEventFunction)&MyFrame::OnDynamic);
 

+#if wxUSE_STATUSBAR

         SetStatusText(_T("You can now use \"Dynamic\" item in the menu"));
         SetStatusText(_T("Dynamic: on"), Status_Dynamic);
         SetStatusText(_T("You can now use \"Dynamic\" item in the menu"));
         SetStatusText(_T("Dynamic: on"), Status_Dynamic);

+#endif // wxUSE_STATUSBAR

     }
     else // connect
     {
         Disconnect(Event_Dynamic, wxID_ANY, wxEVT_COMMAND_MENU_SELECTED);
 
     }
     else // connect
     {
         Disconnect(Event_Dynamic, wxID_ANY, wxEVT_COMMAND_MENU_SELECTED);
 

+#if wxUSE_STATUSBAR

         SetStatusText(_T("You can no more use \"Dynamic\" item in the menu"));
         SetStatusText(_T("Dynamic: off"), Status_Dynamic);
         SetStatusText(_T("You can no more use \"Dynamic\" item in the menu"));
         SetStatusText(_T("Dynamic: off"), Status_Dynamic);

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 


@@ -343,7 +347,9 @@ void MyFrame::OnPushEventHandler(wxCommandEvent& WXUNUSED(event))
 {
     PushEventHandler(new MyEvtHandler(++m_nPush));
 
 {
     PushEventHandler(new MyEvtHandler(++m_nPush));
 

+#if wxUSE_STATUSBAR

     SetStatusText(wxString::Format(_T("Push count: %u"), m_nPush), Status_Push);
     SetStatusText(wxString::Format(_T("Push count: %u"), m_nPush), Status_Push);

+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::OnPopEventHandler(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnPopEventHandler(wxCommandEvent& WXUNUSED(event))


@@ -353,7 +359,9 @@ void MyFrame::OnPopEventHandler(wxCommandEvent& WXUNUSED(event))
     PopEventHandler(true /* delete handler */);
     m_nPush--;
 
     PopEventHandler(true /* delete handler */);
     m_nPush--;
 

+#if wxUSE_STATUSBAR

     SetStatusText(wxString::Format(_T("Push count: %u"), m_nPush), Status_Push);
     SetStatusText(wxString::Format(_T("Push count: %u"), m_nPush), Status_Push);

+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event))

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index a2d13fa08d3487940b407f599eb1ba9619f8fe76..c11dfa737076ea853b22095a873c41cfab3ca78d 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -293,9 +293,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     splitter->SplitHorizontally(m_textctrl, m_canvas, 100);
 
 
     splitter->SplitHorizontally(m_textctrl, m_canvas, 100);
 

+#if wxUSE_STATUSBAR

     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar();
     SetStatusText(wxT("Welcome to wxWidgets font demo!"));
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar();
     SetStatusText(wxT("Welcome to wxWidgets font demo!"));

+#endif // wxUSE_STATUSBAR

 }
 
 // --------------------------------------------------------
 }
 
 // --------------------------------------------------------

diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index d0dc6d94712110052a5415076fe3b5fe98628d03..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);
 
     // ... 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!"));
     // 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
 
 
     // now create some controls
 

diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index aa0f22e7f674951937dc387728c5eef63780ed92..93b6d26f581ec1d716dd30b0db1fc6559b3f4916 100644 (file)
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -335,7 +335,9 @@ void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
         m_hlbox->SetBackgroundColour(col);
         m_hlbox->Refresh();
 
         m_hlbox->SetBackgroundColour(col);
         m_hlbox->Refresh();
 

+#if wxUSE_STATUSBAR

         SetStatusText(_T("Background colour changed."));
         SetStatusText(_T("Background colour changed."));

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 


@@ -347,7 +349,9 @@ void MyFrame::OnSetSelBgCol(wxCommandEvent& WXUNUSED(event))
         m_hlbox->SetSelectionBackground(col);
         m_hlbox->Refresh();
 
         m_hlbox->SetSelectionBackground(col);
         m_hlbox->Refresh();
 

+#if wxUSE_STATUSBAR

         SetStatusText(_T("Selection background colour changed."));
         SetStatusText(_T("Selection background colour changed."));

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 


@@ -387,10 +391,12 @@ void MyFrame::OnLboxSelect(wxCommandEvent& event)
             wxLogMessage(_T("Selected items: %s"), s.c_str());
     }
 
             wxLogMessage(_T("Selected items: %s"), s.c_str());
     }
 

+#if wxUSE_STATUSBAR

     SetStatusText(wxString::Format(
                     _T("# items selected = %lu"),
                     (unsigned long)m_hlbox->GetSelectedCount()
                   ));
     SetStatusText(wxString::Format(
                     _T("# items selected = %lu"),
                     (unsigned long)m_hlbox->GetSelectedCount()
                   ));

+#endif // wxUSE_STATUSBAR

 }
 
 // ============================================================================
 }
 
 // ============================================================================

diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index 90497c7de8c6d4890524d6e7a4f21ef1cf432492..7d3f11bf00da145ed5702ac347279db669b3cea9 100644 (file)
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@@ -189,11 +189,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(1);
     CreateStatusBar(1);

+#endif // wxUSE_STATUSBAR

 
     m_Html = new wxHtmlWindow(this);
     m_Html -> SetRelatedFrame(this, _("HTML : %s"));
 
     m_Html = new wxHtmlWindow(this);
     m_Html -> SetRelatedFrame(this, _("HTML : %s"));

+#if wxUSE_STATUSBAR

     m_Html -> SetRelatedStatusBar(0);
     m_Html -> SetRelatedStatusBar(0);

+#endif // wxUSE_STATUSBAR

     m_Name = wxT("test.htm");
     m_Html -> LoadPage(m_Name);
     
     m_Name = wxT("test.htm");
     m_Html -> LoadPage(m_Name);
     

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index d514ddc7bac217fce40a10a99b832e05098a0dfa..50e10402e4fbeb1547993d54b6ec46d5d5d4df17 100644 (file)
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -184,13 +184,17 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetAcceleratorTable(accel);
 #endif // wxUSE_ACCEL
 
     SetAcceleratorTable(accel);
 #endif // wxUSE_ACCEL
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(1);
     CreateStatusBar(1);

+#endif // wxUSE_STATUSBAR

 
     m_Processor = new BoldProcessor;
     m_Processor->Enable(false);
     m_Html = new wxHtmlWindow(this);
     m_Html->SetRelatedFrame(this, _("HTML : %s"));
 
     m_Processor = new BoldProcessor;
     m_Processor->Enable(false);
     m_Html = new wxHtmlWindow(this);
     m_Html->SetRelatedFrame(this, _("HTML : %s"));

+#if wxUSE_STATUSBAR

     m_Html->SetRelatedStatusBar(0);
     m_Html->SetRelatedStatusBar(0);

+#endif // wxUSE_STATUSBAR

     m_Html->ReadCustomization(wxConfig::Get());
     m_Html->LoadFile(wxFileName(wxT("test.htm")));
     m_Html->AddProcessor(m_Processor);
     m_Html->ReadCustomization(wxConfig::Get());
     m_Html->LoadFile(wxFileName(wxT("test.htm")));
     m_Html->AddProcessor(m_Processor);

diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp
index 75d9193dfbb2dd438b52f91570051b919c2b32f5..0260ba5514565354888a74fc55f457023459e9a9 100644 (file)
--- a/samples/html/virtual/virtual.cpp
+++ b/samples/html/virtual/virtual.cpp
@@ -202,11 +202,15 @@ wxHtmlWindow *html;
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
    
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
    

+#if wxUSE_STATUSBAR

       CreateStatusBar(2);
       CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
       html = new wxHtmlWindow(this);
       html -> SetRelatedFrame(this, _("VFS Demo: '%s'"));
 
       html = new wxHtmlWindow(this);
       html -> SetRelatedFrame(this, _("VFS Demo: '%s'"));

+#if wxUSE_STATUSBAR

       html -> SetRelatedStatusBar(1);
       html -> SetRelatedStatusBar(1);

+#endif // wxUSE_STATUSBAR

       html -> LoadPage(wxT("start.htm"));
    }
 
       html -> LoadPage(wxT("start.htm"));
    }
 

diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index 816c029b7bf6821803589e944c5a945c652cf75c..667d7705aa3f0976bce51f82afda73897f2de3ef 100644 (file)
--- a/samples/html/widget/widget.cpp
+++ b/samples/html/widget/widget.cpp
@@ -193,11 +193,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
     html = new wxHtmlWindow(this);
     html -> SetRelatedFrame(this, _("VFS Demo: '%s'"));
 
     html = new wxHtmlWindow(this);
     html -> SetRelatedFrame(this, _("VFS Demo: '%s'"));

+#if wxUSE_STATUSBAR

     html -> SetRelatedStatusBar(1);
     html -> SetRelatedStatusBar(1);

+#endif // wxUSE_STATUSBAR

     html -> LoadPage(wxT("start.htm"));
 }
 
     html -> LoadPage(wxT("start.htm"));
 }
 

diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index f33295c215c6ec89e85da1c4fedeed5c82f3607c..ad3b9b2478ecbd4655f21e74bdc099e99d74203b 100644 (file)
--- a/samples/html/zip/zip.cpp
+++ b/samples/html/zip/zip.cpp
@@ -153,14 +153,16 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(1);
     CreateStatusBar(1);

+#endif // wxUSE_STATUSBAR

 
 

-    {

     html = new wxHtmlWindow(this);
     html -> SetRelatedFrame(this, _("HTML : %s"));
     html = new wxHtmlWindow(this);
     html -> SetRelatedFrame(this, _("HTML : %s"));

+#if wxUSE_STATUSBAR

     html -> SetRelatedStatusBar(0);
     html -> SetRelatedStatusBar(0);

+#endif // wxUSE_STATUSBAR

     html -> LoadPage(wxT("start.htm"));
     html -> LoadPage(wxT("start.htm"));

-    }

 }
 
 
 }
 
 

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index dd69ad6a455da93f8522b50825fc7d827d84f052..9c3108725fbaa1e8b91c37263eb7cbd1b5f8ef95 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -880,9 +880,11 @@ MyFrame::MyFrame()
 
   SetMenuBar( menu_bar );
 
 
   SetMenuBar( menu_bar );
 

+#if wxUSE_STATUSBAR

   CreateStatusBar(2);
   int widths[] = { -1, 100 };
   SetStatusWidths( 2, widths );
   CreateStatusBar(2);
   int widths[] = { -1, 100 };
   SetStatusWidths( 2, widths );

+#endif // wxUSE_STATUSBAR

 
   m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );
 
 
   m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );
 

diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index 44401f971848951913181d638a1536e6b0cdd041..0ea33ed6bf3f1b27bf639a06b7d7ce88e574c11c 100644 (file)
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -100,7 +100,9 @@ int MyApp::OnExit()
 MyFrame::MyFrame(wxFrame *frame, const wxString& title)
        : wxFrame(frame, wxID_ANY, title, wxDefaultPosition, wxSize(350, 250))
 {
 MyFrame::MyFrame(wxFrame *frame, const wxString& title)
        : wxFrame(frame, wxID_ANY, title, wxDefaultPosition, wxSize(350, 250))
 {

+#if wxUSE_STATUSBAR

     CreateStatusBar();
     CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
     // Give it an icon
     SetIcon(wxICON(mondrian));
 
     // Give it an icon
     SetIcon(wxICON(mondrian));

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 3e99d2349606ce3f17033ba9b5ac82a679ec5de9..924103bf019ae3953f3fe42481749718b4184c3f 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -24,10 +24,6 @@
 #   error You must set wxUSE_JOYSTICK to 1 in setup.h
 #endif
 
 #   error You must set wxUSE_JOYSTICK to 1 in setup.h
 #endif
 

-#if !wxUSE_STATUSBAR
-#   error You must set wxUSE_STATUSBAR to 1 in setup.h
-#endif
-

 #include "wx/sound.h"
 #include "wx/joystick.h"
 
 #include "wx/sound.h"
 #include "wx/joystick.h"
 


@@ -87,7 +83,9 @@ bool MyApp::OnInit()
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

     frame->CreateStatusBar();
     frame->CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
     frame->CenterOnScreen();
     frame->Show(true);
 
     frame->CenterOnScreen();
     frame->Show(true);


@@ -151,6 +149,7 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
     xpos = pt.x;
     ypos = pt.y;
 
     xpos = pt.x;
     ypos = pt.y;
 

+#if wxUSE_STATUSBAR

     wxString buf;
     if (event.ButtonDown())
         buf.Printf(_T("Joystick (%d, %d) Fire!"), pt.x, pt.y);
     wxString buf;
     if (event.ButtonDown())
         buf.Printf(_T("Joystick (%d, %d) Fire!"), pt.x, pt.y);


@@ -158,6 +157,7 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
         buf.Printf(_T("Joystick (%d, %d)"), pt.x, pt.y);
 
     frame->SetStatusText(buf);
         buf.Printf(_T("Joystick (%d, %d)"), pt.x, pt.y);
 
     frame->SetStatusText(buf);

+#endif // wxUSE_STATUSBAR

 
 #if wxUSE_SOUND
     if (event.ButtonDown() && wxGetApp().m_fire.IsOk())
 
 #if wxUSE_SOUND
     if (event.ButtonDown() && wxGetApp().m_fire.IsOk())

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index 5a7e7a8c5943774c64922185bddea3bf42a6c29b..1ee69f89e513cb3e7d90626750849dc153f5277a 100644 (file)
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -91,9 +91,10 @@ MyFrame::MyFrame()
   // Associate the menu bar with the frame
   SetMenuBar(menu_bar);
 
   // Associate the menu bar with the frame
   SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

   CreateStatusBar(2);
   SetStatusText(_T("wxWidgets layout demo"));
   CreateStatusBar(2);
   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
 
   // we want to get a dialog that is stretchable because it
   // has a text ctrl in the middle. at the bottom, we have

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index f7c3851ba41c6523cbc1c8b627a62fc737d79f0e..b440b9eaf75a61e6918f847c7a62728f1e810bc2 100644 (file)
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -238,7 +238,9 @@ MyFrame::MyFrame(const wxChar *title, int x, int y, int w, int h)
 
     RecreateList(wxLC_REPORT | wxLC_SINGLE_SEL);
 
 
     RecreateList(wxLC_REPORT | wxLC_SINGLE_SEL);
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(3);
     CreateStatusBar(3);

+#endif // wxUSE_STATUSBAR

 }
 
 MyFrame::~MyFrame()
 }
 
 MyFrame::~MyFrame()

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index f8b7b47e74cd68b4c317b23697a21ca343d47f21..33582119bc395bf3a97f01de159778b61376195a 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -145,7 +145,9 @@ bool MyApp::OnInit()
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

     frame->CreateStatusBar();
     frame->CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
     frame->Show(true);
 
 
     frame->Show(true);
 


@@ -260,8 +262,10 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);
 
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

     subframe->CreateStatusBar();
     subframe->SetStatusText(title);
     subframe->CreateStatusBar();
     subframe->SetStatusText(title);

+#endif // wxUSE_STATUSBAR

 
     int width, height;
     subframe->GetClientSize(&width, &height);
 
     int width, height;
     subframe->GetClientSize(&width, &height);

diff --git a/samples/mobile/styles/styles.cpp b/samples/mobile/styles/styles.cpp
index 14bc75339072e383c569b1771cf76f745a0490a8..55d194a95c570d8efdb4523a1a537f779fc7bb03 100644 (file)
--- a/samples/mobile/styles/styles.cpp
+++ b/samples/mobile/styles/styles.cpp
@@ -37,8 +37,10 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title,
 {
     // Create menu and status bar.
     CreateMyMenuBar();
 {
     // Create menu and status bar.
     CreateMyMenuBar();

+#if wxUSE_STATUSBAR

     CreateStatusBar(1);
     SetStatusText( _T("Welcome to Styles!") );
     CreateStatusBar(1);
     SetStatusText( _T("Welcome to Styles!") );

+#endif // wxUSE_STATUSBAR

     
     wxImage image;
     image.LoadFile( _T("marble.jpg"), wxBITMAP_TYPE_JPEG );
     
     wxImage image;
     image.LoadFile( _T("marble.jpg"), wxBITMAP_TYPE_JPEG );

diff --git a/samples/mobile/wxedit/wxedit.cpp b/samples/mobile/wxedit/wxedit.cpp
index fa4a2d3ee3d6571522105b9df82bfd46e5fc28a2..53d6b6f710675d9b9a5affc756814b95483f545b 100644 (file)
--- a/samples/mobile/wxedit/wxedit.cpp
+++ b/samples/mobile/wxedit/wxedit.cpp
@@ -58,8 +58,10 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title,
 {
     // Create menu and status bar.
     CreateMyMenuBar();
 {
     // Create menu and status bar.
     CreateMyMenuBar();

+#if wxUSE_STATUSBAR

     CreateStatusBar(1);
     SetStatusText( _T("Welcome to wxEdit!") );
     CreateStatusBar(1);
     SetStatusText( _T("Welcome to wxEdit!") );

+#endif // wxUSE_STATUSBAR

     
     // Create edit control. Since it is the only
     // control in the frame, it will be resized
     
     // Create edit control. Since it is the only
     // control in the frame, it will be resized


@@ -179,12 +181,14 @@ void MyFrame::OnLastFiles( wxCommandEvent &event )
     
     if( index < m_history.GetCount() )
     {
     
     if( index < m_history.GetCount() )
     {

-    m_filename = m_history[index];
+        m_filename = m_history[index];

     
     

-    m_text->Clear();
-    m_text->LoadFile( m_filename );
+        m_text->Clear();
+        m_text->LoadFile( m_filename );

     
     

-    SetStatusText( m_filename );
+#if wxUSE_STATUSBAR
+        SetStatusText( m_filename );
+#endif // wxUSE_STATUSBAR

     }
     else
     {
     }
     else
     {


@@ -208,7 +212,9 @@ void MyFrame::OnNew( wxCommandEvent& WXUNUSED(event) )
         
     m_filename = wxEmptyString;
     
         
     m_filename = wxEmptyString;
     

+#if wxUSE_STATUSBAR

     SetStatusText( _T("") );
     SetStatusText( _T("") );

+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::OnOpen( wxCommandEvent& WXUNUSED(event) )
 }
 
 void MyFrame::OnOpen( wxCommandEvent& WXUNUSED(event) )


@@ -252,7 +258,9 @@ void MyFrame::OnOpen( wxCommandEvent& WXUNUSED(event) )
         m_filename = dialog.GetPath();
         m_text->LoadFile( m_filename );
     
         m_filename = dialog.GetPath();
         m_text->LoadFile( m_filename );
     

+#if wxUSE_STATUSBAR

         SetStatusText( m_filename );
         SetStatusText( m_filename );

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 


@@ -271,7 +279,9 @@ void MyFrame::OnSaveAs( wxCommandEvent& WXUNUSED(event) )
         m_filename = dialog.GetPath();
         m_text->SaveFile( m_filename );
     
         m_filename = dialog.GetPath();
         m_text->SaveFile( m_filename );
     

+#if wxUSE_STATUSBAR

         SetStatusText( m_filename );
         SetStatusText( m_filename );

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 

diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp
index 2028fb17d24ba49f5345d26b69d061ef7ffe6d7d..3bb9a214944bc65d3c422bc219b2e23de4f6ab08 100644 (file)
--- a/samples/nativdlg/nativdlg.cpp
+++ b/samples/nativdlg/nativdlg.cpp
@@ -44,8 +44,10 @@ bool MyApp::OnInit(void)
   // Create the main frame window
   MyFrame   *frame = new MyFrame(NULL, wxID_ANY, _T("wxWidgets Native Dialog Sample"), wxPoint(0, 0), wxSize(300, 250));
 
   // Create the main frame window
   MyFrame   *frame = new MyFrame(NULL, wxID_ANY, _T("wxWidgets Native Dialog Sample"), wxPoint(0, 0), wxSize(300, 250));
 

+#if wxUSE_STATUSBAR

   // Give it a status line
   frame->CreateStatusBar(2);
   // Give it a status line
   frame->CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;

diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index 1d851b9f64f39d8b7ebc0e93e5c728ba6238dbf5..a4de77a6a24fbe8acce0eeddc2d04e0e21572bbc 100644 (file)
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -170,9 +170,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... 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(2);
     SetStatusText(_T("Welcome to wxWidgets!"));
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
     SetStatusText(_T("Welcome to wxWidgets!"));

+#endif // wxUSE_STATUSBAR

 }
 
 
 }
 
 

diff --git a/samples/ownerdrw/ownerdrw.cpp b/samples/ownerdrw/ownerdrw.cpp
index c0e47b4b8b7b0d1816f31d5550fc7d09c63ae975..cfaadcc75609cbad49b0fd3aa137b3dbbf0a6d7e 100644 (file)
--- a/samples/ownerdrw/ownerdrw.cpp
+++ b/samples/ownerdrw/ownerdrw.cpp
@@ -212,11 +212,13 @@ OwnerDrawnFrame::OwnerDrawnFrame(wxFrame *frame, wxChar *title,
     // create the menu
     InitMenu();
 
     // create the menu
     InitMenu();
 

+#if wxUSE_STATUSBAR

     // create the status line
     const int widths[] = { -1, 60 };
     CreateStatusBar(2);
     SetStatusWidths(2, widths);
     SetStatusText(_T("no selection"), 0);
     // create the status line
     const int widths[] = { -1, 60 };
     CreateStatusBar(2);
     SetStatusWidths(2, widths);
     SetStatusText(_T("no selection"), 0);

+#endif // wxUSE_STATUSBAR

 
     // make a panel with some controls
     wxPanel *pPanel = new wxPanel(this);
 
     // make a panel with some controls
     wxPanel *pPanel = new wxPanel(this);


@@ -332,11 +334,15 @@ void OwnerDrawnFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void OwnerDrawnFrame::OnListboxSelect(wxCommandEvent& event)
 {
 
 void OwnerDrawnFrame::OnListboxSelect(wxCommandEvent& event)
 {

+#if wxUSE_STATUSBAR

     wxString strSelection;
     unsigned int nSel = event.GetSelection();
     strSelection.Printf(wxT("item %d selected (%schecked)"), nSel,
                         m_pListBox->IsChecked(nSel) ? wxT("") : wxT("not "));
     SetStatusText(strSelection);
     wxString strSelection;
     unsigned int nSel = event.GetSelection();
     strSelection.Printf(wxT("item %d selected (%schecked)"), nSel,
                         m_pListBox->IsChecked(nSel) ? wxT("") : wxT("not "));
     SetStatusText(strSelection);

+#else
+    wxUnusedVar(event);
+#endif // wxUSE_STATUSBAR

 }
 
 void OwnerDrawnFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event))
 }
 
 void OwnerDrawnFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event))


@@ -350,9 +356,13 @@ void OwnerDrawnFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event))
 
 void OwnerDrawnFrame::OnCheckboxToggle(wxCommandEvent& event)
 {
 
 void OwnerDrawnFrame::OnCheckboxToggle(wxCommandEvent& event)
 {

+#if wxUSE_STATUSBAR

     wxString strSelection;
     unsigned int nItem = event.GetInt();
     strSelection.Printf(wxT("item %d was %schecked"), nItem,
                         m_pListBox->IsChecked(nItem) ? wxT("") : wxT("un"));
     SetStatusText(strSelection);
     wxString strSelection;
     unsigned int nItem = event.GetInt();
     strSelection.Printf(wxT("item %d was %schecked"), nItem,
                         m_pListBox->IsChecked(nItem) ? wxT("") : wxT("un"));
     SetStatusText(strSelection);

+#else
+    wxUnusedVar(event);
+#endif // wxUSE_STATUSBAR

 }
 }

diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp
index 7bbd13e4739b7a28f6e767bd13166d633e7982cf..7d1c3a47d3ffbdd7f5480b0577e75ba3db2c5fef 100644 (file)
--- a/samples/png/pngdemo.cpp
+++ b/samples/png/pngdemo.cpp
@@ -40,8 +40,10 @@ bool MyApp::OnInit(void)
   // Create the main frame window
   frame = new MyFrame((wxFrame *) NULL, _T("wxPNGBitmap Demo"), wxPoint(0, 0), wxSize(300, 300));
 
   // Create the main frame window
   frame = new MyFrame((wxFrame *) NULL, _T("wxPNGBitmap Demo"), wxPoint(0, 0), wxSize(300, 300));
 

+#if wxUSE_STATUSBAR

   // Give it a status line
   frame->CreateStatusBar(2);
   // Give it a status line
   frame->CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;


@@ -68,7 +70,9 @@ bool MyApp::OnInit(void)
 
   frame->Show(true);
 
 
   frame->Show(true);
 

+#if wxUSE_STATUSBAR

   frame->SetStatusText(_T("Hello, wxWidgets"));
   frame->SetStatusText(_T("Hello, wxWidgets"));

+#endif // wxUSE_STATUSBAR

 
   return true;
 }
 
   return true;
 }

diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index 8cc579cb293eff5e8af91addd6ffe5852ca049f2..95d65c86d366af4620f236b42cc59392be8bfa00 100644 (file)
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -82,8 +82,10 @@ bool MyApp::OnInit(void)
     // Create the main frame window
     frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets Printing Demo"), wxPoint(0, 0), wxSize(400, 400));
 
     // Create the main frame window
     frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets Printing Demo"), wxPoint(0, 0), wxSize(400, 400));
 

+#if wxUSE_STATUSBAR

     // Give it a status line
     frame->CreateStatusBar(2);
     // Give it a status line
     frame->CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
     // Load icon and bitmap
     frame->SetIcon( wxICON( mondrian) );
 
     // Load icon and bitmap
     frame->SetIcon( wxICON( mondrian) );


@@ -135,7 +137,9 @@ bool MyApp::OnInit(void)
     frame->Centre(wxBOTH);
     frame->Show();
 
     frame->Centre(wxBOTH);
     frame->Show();
 

+#if wxUSE_STATUSBAR

     frame->SetStatusText(_T("Printing demo"));
     frame->SetStatusText(_T("Printing demo"));

+#endif // wxUSE_STATUSBAR

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index b3e3367cbf43e48d4d6746ddd34ad4ef2aee2e9b..4cca25f55de08d79f7dc813a4f1619edb56c4a23 100644 (file)
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -361,9 +361,11 @@ RegFrame::RegFrame(wxFrame *parent, wxChar *title, int x, int y, int w, int h)
     m_treeCtrl = new RegTreeCtrl(this, Ctrl_RegTree);
 #endif
 
     m_treeCtrl = new RegTreeCtrl(this, Ctrl_RegTree);
 #endif
 

+#if wxUSE_STATUSBAR

     // create the status line
     // ----------------------
     CreateStatusBar(2);
     // create the status line
     // ----------------------
     CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 }
 
 RegFrame::~RegFrame()
 }
 
 RegFrame::~RegFrame()


@@ -697,8 +699,12 @@ void RegTreeCtrl::OnChar(wxKeyEvent& event)
 
 void RegTreeCtrl::OnSelChanged(wxTreeEvent& event)
 {
 
 void RegTreeCtrl::OnSelChanged(wxTreeEvent& event)
 {

+#if wxUSE_STATUSBAR

     wxFrame *pFrame = (wxFrame *) wxWindow::GetParent();
     pFrame->SetStatusText(GetNode(event)->FullName(), 1);
     wxFrame *pFrame = (wxFrame *) wxWindow::GetParent();
     pFrame->SetStatusText(GetNode(event)->FullName(), 1);

+#else
+    wxUnusedVar(event);
+#endif // wxUSE_STATUSBAR

 }
 
 void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
 }
 
 void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)

diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp
index 560a5ebc90db68656d38409e8a600e46f0370657..7db36a819a4b5c939969cff969ffe0a9d26ffddf 100644 (file)
--- a/samples/sashtest/sashtest.cpp
+++ b/samples/sashtest/sashtest.cpp
@@ -70,7 +70,9 @@ bool MyApp::OnInit(void)
   // Associate the menu bar with the frame
   frame->SetMenuBar(menu_bar);
 
   // Associate the menu bar with the frame
   frame->SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

   frame->CreateStatusBar();
   frame->CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
   frame->Show(true);
 
 
   frame->Show(true);
 


@@ -228,8 +230,10 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event))
       subframe->SetIcon(wxIcon(_T("sashtest_icn")));
 #endif
 
       subframe->SetIcon(wxIcon(_T("sashtest_icn")));
 #endif
 

+#if wxUSE_STATUSBAR

       // Give it a status line
       subframe->CreateStatusBar();
       // Give it a status line
       subframe->CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
       // Make a menubar
       wxMenu *file_menu = new wxMenu;
 
       // Make a menubar
       wxMenu *file_menu = new wxMenu;

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index f0725ee57d8a8260c90d34243e4fa875daa62421..5484c73dac3f47050665819327fc890883b5016f 100644 (file)
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -453,9 +453,11 @@ MyFrame::MyFrame()
 
     SetMenuBar( menu_bar );
 
 
     SetMenuBar( menu_bar );
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );
     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );

+#endif // wxUSE_STATUSBAR

 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 

diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp
index fc9864f45c56faa483166e7b526ef4cb83f9cdba..6ea28ffcec4a6ebb1b4cd0cb154fb0010327ff52 100644 (file)
--- a/samples/scrollsub/scrollsub.cpp
+++ b/samples/scrollsub/scrollsub.cpp
@@ -391,9 +391,11 @@ MyFrame::MyFrame()
 
     SetMenuBar( menu_bar );
 
 
     SetMenuBar( menu_bar );
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );
     CreateStatusBar(2);
     int widths[] = { -1, 100 };
     SetStatusWidths( 2, widths );

+#endif // wxUSE_STATUSBAR

 
     m_scrolled = new MyScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize(100,100) );
     m_scrolled->SetScrollbars( 10, 10, 50, 50 );
 
     m_scrolled = new MyScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize(100,100) );
     m_scrolled->SetScrollbars( 10, 10, 50, 50 );

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index 9ca5518df842ae4c3479b28a98887c897b447088..805ff140fbb576b589bf668451987485e2719805 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -205,8 +205,10 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
   m_menuBar->Append(m_menuProtocols, _("&Protocols"));
   SetMenuBar(m_menuBar);
 
   m_menuBar->Append(m_menuProtocols, _("&Protocols"));
   SetMenuBar(m_menuBar);
 

+#if wxUSE_STATUSBAR

   // Status bar
   CreateStatusBar(2);
   // Status bar
   CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
   // Make a textctrl for logging
   m_text  = new wxTextCtrl(this, wxID_ANY,
 
   // Make a textctrl for logging
   m_text  = new wxTextCtrl(this, wxID_ANY,


@@ -622,7 +624,9 @@ void MyFrame::UpdateStatusBar()
     s.Printf(_("%s : %d"), (addr.Hostname()).c_str(), addr.Service());
   }
 
     s.Printf(_("%s : %d"), (addr.Hostname()).c_str(), addr.Service());
   }
 

+#if wxUSE_STATUSBAR

   SetStatusText(s, 1);
   SetStatusText(s, 1);

+#endif // wxUSE_STATUSBAR

 
   m_menuSocket->Enable(CLIENT_OPEN, !m_sock->IsConnected() && !m_busy);
   m_menuSocket->Enable(CLIENT_TEST1, m_sock->IsConnected() && !m_busy);
 
   m_menuSocket->Enable(CLIENT_OPEN, !m_sock->IsConnected() && !m_busy);
   m_menuSocket->Enable(CLIENT_TEST1, m_sock->IsConnected() && !m_busy);

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index b90dc2643c5259895ee85a1a562ecc982d06ebbb..4904c662fc829abee027d2d8e8069aa32e4f9e3f 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -163,8 +163,10 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
   m_menuBar->Append(m_menuFile, _("&File"));
   SetMenuBar(m_menuBar);
 
   m_menuBar->Append(m_menuFile, _("&File"));
   SetMenuBar(m_menuBar);
 

+#if wxUSE_STATUSBAR

   // Status bar
   CreateStatusBar(2);
   // Status bar
   CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
   // Make a textctrl for logging
   m_text  = new wxTextCtrl(this, wxID_ANY,
 
   // Make a textctrl for logging
   m_text  = new wxTextCtrl(this, wxID_ANY,


@@ -412,7 +414,9 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event)
 
 void MyFrame::UpdateStatusBar()
 {
 
 void MyFrame::UpdateStatusBar()
 {

+#if wxUSE_STATUSBAR

   wxString s;
   s.Printf(_("%d clients connected"), m_numClients);
   SetStatusText(s, 1);
   wxString s;
   s.Printf(_("%d clients connected"), m_numClients);
   SetStatusText(s, 1);

+#endif // wxUSE_STATUSBAR

 }
 }

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index 633e94ea0b89382de5dc6f61fbbbe74de92c2980..0fdc603d0909cee8c6910366cc4b8e0e38a48cdd 100644 (file)
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -176,7 +176,9 @@ MyFrame::MyFrame()
                  wxDefaultPosition, wxSize(420, 300),
                  wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
                  wxDefaultPosition, wxSize(420, 300),
                  wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {

+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
     // Make a menubar
     wxMenu *splitMenu = new wxMenu;
 
     // Make a menubar
     wxMenu *splitMenu = new wxMenu;


@@ -235,7 +237,9 @@ MyFrame::MyFrame()
     m_splitter->SplitVertically(m_left, m_right, 100);
 #endif
 
     m_splitter->SplitVertically(m_left, m_right, 100);
 #endif
 

+#if wxUSE_STATUSBAR

     SetStatusText(_T("Min pane size = 0"), 1);
     SetStatusText(_T("Min pane size = 0"), 1);

+#endif // wxUSE_STATUSBAR

 }
 
 MyFrame::~MyFrame()
 }
 
 MyFrame::~MyFrame()


@@ -257,7 +261,9 @@ void MyFrame::SplitHorizontal(wxCommandEvent& WXUNUSED(event) )
     m_right->Show(true);
     m_splitter->SplitHorizontally( m_left, m_right );
 
     m_right->Show(true);
     m_splitter->SplitHorizontally( m_left, m_right );
 

+#if wxUSE_STATUSBAR

     SetStatusText(_T("Splitter split horizontally"), 1);
     SetStatusText(_T("Splitter split horizontally"), 1);

+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::SplitVertical(wxCommandEvent& WXUNUSED(event) )
 }
 
 void MyFrame::SplitVertical(wxCommandEvent& WXUNUSED(event) )


@@ -268,14 +274,18 @@ void MyFrame::SplitVertical(wxCommandEvent& WXUNUSED(event) )
     m_right->Show(true);
     m_splitter->SplitVertically( m_left, m_right );
 
     m_right->Show(true);
     m_splitter->SplitVertically( m_left, m_right );
 

+#if wxUSE_STATUSBAR

     SetStatusText(_T("Splitter split vertically"), 1);
     SetStatusText(_T("Splitter split vertically"), 1);

+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::Unsplit(wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();
 }
 
 void MyFrame::Unsplit(wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();

+#if wxUSE_STATUSBAR

     SetStatusText(_T("No splitter"));
     SetStatusText(_T("No splitter"));

+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::ToggleLive(wxCommandEvent& event )
 }
 
 void MyFrame::ToggleLive(wxCommandEvent& event )


@@ -319,8 +329,10 @@ void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 
     int minsize = wxStrtol( str, (wxChar**)NULL, 10 );
     m_splitter->SetMinimumPaneSize(minsize);
 
     int minsize = wxStrtol( str, (wxChar**)NULL, 10 );
     m_splitter->SetMinimumPaneSize(minsize);

+#if wxUSE_STATUSBAR

     str.Printf( wxT("Min pane size = %d"), minsize);
     SetStatusText(str, 1);
     str.Printf( wxT("Min pane size = %d"), minsize);
     SetStatusText(str, 1);

+#endif // wxUSE_STATUSBAR

 }
 
 // Update UI handlers
 }
 
 // Update UI handlers


@@ -380,14 +392,18 @@ void MySplitterWindow::OnPositionChanging(wxSplitterEvent& event)
 
 void MySplitterWindow::OnDClick(wxSplitterEvent& event)
 {
 
 void MySplitterWindow::OnDClick(wxSplitterEvent& event)
 {

+#if wxUSE_STATUSBAR

     m_frame->SetStatusText(_T("Splitter double clicked"), 1);
     m_frame->SetStatusText(_T("Splitter double clicked"), 1);

+#endif // wxUSE_STATUSBAR

 
     event.Skip();
 }
 
 void MySplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)
 {
 
     event.Skip();
 }
 
 void MySplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)
 {

+#if wxUSE_STATUSBAR

     m_frame->SetStatusText(_T("Splitter unsplit"), 1);
     m_frame->SetStatusText(_T("Splitter unsplit"), 1);

+#endif // wxUSE_STATUSBAR

 
     event.Skip();
 }
 
     event.Skip();
 }

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index c229d8c0a78ea40b0d3c5d74ae241badf341bb9c..7579ac0a452338ed35ebe7349ab453b7a39666fa 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -1135,7 +1135,9 @@ END_EVENT_TABLE()
 MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h)
        : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h) )
 {
 MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h)
        : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h) )
 {

+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
     m_panel = new MyPanel( this, 10, 10, 300, 100 );
 }
 
     m_panel = new MyPanel( this, 10, 10, 300, 100 );
 }


@@ -1280,7 +1282,9 @@ void MyFrame::OnIdle( wxIdleEvent& event )
 #endif
                   );
 
 #endif
                   );
 

+#if wxUSE_STATUSBAR

         SetStatusText(msg);
         SetStatusText(msg);

+#endif // wxUSE_STATUSBAR

     }
     event.Skip();
 }
     }
     event.Skip();
 }


@@ -1357,7 +1361,9 @@ RichTextFrame::RichTextFrame(wxWindow* parent, const wxString& title):
     menuBar->Append(editMenu, _("Edit"));
 
     SetMenuBar(menuBar);
     menuBar->Append(editMenu, _("Edit"));
 
     SetMenuBar(menuBar);

+#if wxUSE_STATUSBAR

     CreateStatusBar();
     CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 }
 
 // Event handlers
 }
 
 // Event handlers


@@ -1548,6 +1554,7 @@ void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
     long insertionPoint = m_textCtrl->GetInsertionPoint();
     if (insertionPoint != m_currentPosition)
     {
     long insertionPoint = m_textCtrl->GetInsertionPoint();
     if (insertionPoint != m_currentPosition)
     {

+#if wxUSE_STATUSBAR

         wxTextAttr attr;
         if (m_textCtrl->GetStyle(insertionPoint, attr))
         {
         wxTextAttr attr;
         if (m_textCtrl->GetStyle(insertionPoint, attr))
         {


@@ -1572,6 +1579,7 @@ void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
                 (const wxChar*) alignment);
             SetStatusText(msg);
         }
                 (const wxChar*) alignment);
             SetStatusText(msg);
         }

+#endif // wxUSE_STATUSBAR

         m_currentPosition = insertionPoint;
     }
 }
         m_currentPosition = insertionPoint;
     }
 }

diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index 7a6b0ef5e77d4fe5bd67500b500c78442a5c1717..dd421d794dce67150dc52e49ee8143c1c5f37bc4 100644 (file)
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -423,7 +423,9 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title,
 
     m_dlgProgress = (wxProgressDialog *)NULL;
 
 
     m_dlgProgress = (wxProgressDialog *)NULL;
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
     m_txtctrl = new wxTextCtrl(this, wxID_ANY, _T(""), wxPoint(0, 0), wxSize(0, 0),
                                wxTE_MULTILINE | wxTE_READONLY);
 
     m_txtctrl = new wxTextCtrl(this, wxID_ANY, _T(""), wxPoint(0, 0), wxSize(0, 0),
                                wxTE_MULTILINE | wxTE_READONLY);


@@ -525,9 +527,11 @@ void MyFrame::OnStartThreads(wxCommandEvent& WXUNUSED(event) )
         threads.Add(thr);
     }
 
         threads.Add(thr);
     }
 

+#if wxUSE_STATUSBAR

     wxString msg;
     msg.Printf(wxT("%d new threads created."), count);
     SetStatusText(msg, 1);
     wxString msg;
     msg.Printf(wxT("%d new threads created."), count);
     SetStatusText(msg, 1);

+#endif // wxUSE_STATUSBAR

 
     // ...and then start them
     for ( n = 0; n < count; n++ )
 
     // ...and then start them
     for ( n = 0; n < count; n++ )


@@ -545,7 +549,9 @@ void MyFrame::OnStartThread(wxCommandEvent& WXUNUSED(event) )
         wxLogError(wxT("Can't start thread!"));
     }
 
         wxLogError(wxT("Can't start thread!"));
     }
 

+#if wxUSE_STATUSBAR

     SetStatusText(_T("New thread started."), 1);
     SetStatusText(_T("New thread started."), 1);

+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::OnStopThread(wxCommandEvent& WXUNUSED(event) )
 }
 
 void MyFrame::OnStopThread(wxCommandEvent& WXUNUSED(event) )


@@ -570,7 +576,9 @@ void MyFrame::OnStopThread(wxCommandEvent& WXUNUSED(event) )
 
         thread->Delete();
 
 
         thread->Delete();
 

+#if wxUSE_STATUSBAR

         SetStatusText(_T("Thread stopped."), 1);
         SetStatusText(_T("Thread stopped."), 1);

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 


@@ -591,7 +599,9 @@ void MyFrame::OnResumeThread(wxCommandEvent& WXUNUSED(event) )
     {
         wxGetApp().m_threads[n]->Resume();
 
     {
         wxGetApp().m_threads[n]->Resume();
 

+#if wxUSE_STATUSBAR

         SetStatusText(_T("Thread resumed."), 1);
         SetStatusText(_T("Thread resumed."), 1);

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 


@@ -612,7 +622,9 @@ void MyFrame::OnPauseThread(wxCommandEvent& WXUNUSED(event) )
     {
         wxGetApp().m_threads[n]->Pause();
 
     {
         wxGetApp().m_threads[n]->Pause();
 

+#if wxUSE_STATUSBAR

         SetStatusText(_T("Thread paused."), 1);
         SetStatusText(_T("Thread paused."), 1);

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index c13dc5050ee9e777a88df45682c2cbba6112937f..181b30df0027b564e485117520befe64c8db6da8 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -265,7 +265,7 @@ bool MyApp::OnInit()
 
     frame->Show(true);
 
 
     frame->Show(true);
 

-#ifndef __SMARTPHONE__
+#if wxUSE_STATUSBAR

     frame->SetStatusText(_T("Hello, wxWidgets"));
 #endif
 
     frame->SetStatusText(_T("Hello, wxWidgets"));
 #endif
 


@@ -389,7 +389,7 @@ MyFrame::MyFrame(wxFrame* parent,
     m_rows = 1;
     m_nPrint = 1;
 
     m_rows = 1;
     m_nPrint = 1;
 

-#ifndef __SMARTPHONE__
+#if wxUSE_STATUSBAR

     // Give it a status line
     CreateStatusBar();
 #endif
     // Give it a status line
     CreateStatusBar();
 #endif


@@ -711,7 +711,7 @@ void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnToolEnter(wxCommandEvent& event)
 {
 
 void MyFrame::OnToolEnter(wxCommandEvent& event)
 {

-#ifndef __SMARTPHONE__
+#if wxUSE_STATUSBAR

     if (event.GetSelection() > -1)
     {
         wxString str;
     if (event.GetSelection() > -1)
     {
         wxString str;


@@ -720,7 +720,9 @@ void MyFrame::OnToolEnter(wxCommandEvent& event)
     }
     else
         SetStatusText(_T(""));
     }
     else
         SetStatusText(_T(""));

-#endif
+#else
+    wxUnusedVar(event);
+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)
 }
 
 void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)

diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 052d043a521709c6521275071fa49d254de16284..3e3e1130e84f8285e5516f5cded943514e2bd305 100644 (file)
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -120,7 +120,9 @@ MyFrame::MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int
     wxValidator::SetBellOnError(m_silent);
     file_menu->Check(VALIDATE_TOGGLE_BELL, !wxValidator::IsSilent());
 
     wxValidator::SetBellOnError(m_silent);
     file_menu->Check(VALIDATE_TOGGLE_BELL, !wxValidator::IsSilent());
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(1);
     CreateStatusBar(1);

+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))

diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp
index 515b8183bc458b2864a79e9bf225bd28291d8aa4..4fcf2c0b3d1c77832126e13ae70920884f8e57e1 100644 (file)
--- a/samples/vscroll/vstest.cpp
+++ b/samples/vscroll/vstest.cpp
@@ -100,6 +100,7 @@ public:
 
     void OnIdle(wxIdleEvent&)
     {
 
     void OnIdle(wxIdleEvent&)
     {

+#if wxUSE_STATUSBAR

         m_frame->SetStatusText(wxString::Format
                                (
                                     _T("Page size = %d, pos = %d, max = %d"),
         m_frame->SetStatusText(wxString::Format
                                (
                                     _T("Page size = %d, pos = %d, max = %d"),


@@ -107,6 +108,7 @@ public:
                                     GetScrollPos(wxVERTICAL),
                                     GetScrollRange(wxVERTICAL)
                                ));
                                     GetScrollPos(wxVERTICAL),
                                     GetScrollRange(wxVERTICAL)
                                ));

+#endif // wxUSE_STATUSBAR

         m_changed = false;
     }
 
         m_changed = false;
     }