Emptied patch.rsp

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

diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index 12405daf5f59c70348021e647dbe450651b101d1..e1aed5d11a0f9d510154adfa5b802115040967cc 100644 (file)
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "statbar.cpp"
-    #pragma interface "statbar.cpp"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -313,7 +308,7 @@ void MyFrame::DoCreateStatusBar(MyFrame::StatBarKind kind)
             break;
 
         default:
-            wxFAIL_MSG("unknown stat bar kind");
+            wxFAIL_MSG(wxT("unknown stat bar kind"));
     }
 
     GetStatusBar()->Show();
@@ -329,9 +324,9 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
 
     long nFields = wxGetNumberFromUser
                    (
-                    "Select the number of fields in the status bar",
-                    "Fields:",
-                    "wxWindows statusbar sample",
+                    _T("Select the number of fields in the status bar"),
+                    _T("Fields:"),
+                    _T("wxWindows statusbar sample"),
                     sb->GetFieldsCount(),
                     1, 5,
                     this
@@ -345,7 +340,7 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
         static const int widthsFor3Fields[] = { -1, -2, -1 };
         static const int widthsFor4Fields[] = { 100, -1, 100, -2, 100 };
 
-        static const int *widths[] =
+        static const int *widthsAll[] =
         {
             NULL,               // 1 field: default
             widthsFor2Fields,   // 2 fields: 1 fixed, 1 var
@@ -354,11 +349,26 @@ void MyFrame::OnSetStatusFields(wxCommandEvent& WXUNUSED(event))
             NULL                // 5 fields: default (all have same width)
         };
 
-        sb->SetFieldsCount(nFields, widths[nFields - 1]);
+        const int * const widths = widthsAll[nFields - 1];
+        sb->SetFieldsCount(nFields, widths);
+
+        wxString s;
+        for ( long n = 0; n < nFields; n++ )
+        {
+            if ( widths )
+            {
+                if ( widths[n] > 0 )
+                    s.Printf(_T("fixed (%d)"), widths[n]);
+                else
+                    s.Printf(_T("variable (*%d)"), -widths[n]);
+            }
+            else
+            {
+                s = _T("default");
+            }
 
-        wxLogStatus(this,
-                    wxString::Format(wxT("Status bar now has %ld fields"),
-                                     nFields));
+            SetStatusText(s, n);
+        }
     }
     else
     {