Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

[wxWidgets.git] / include / wx / msw / statbr95.h

diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h
index 889ca70aca528e615112ca65329c0d8ced533663..3b26a1fa3adba4c9661e66bc09e57a9268741551 100644 (file)
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -22,7 +22,7 @@ public:
     wxStatusBar95(wxWindow *parent,
                   wxWindowID id = wxID_ANY,
                   long style = wxST_SIZEGRIP,
     wxStatusBar95(wxWindow *parent,
                   wxWindowID id = wxID_ANY,
                   long style = wxST_SIZEGRIP,

-                  const wxString& name = wxEmptyString)
+                  const wxString& name = wxStatusBarNameStr)

     {
         (void)Create(parent, id, style, name);
     }
     {
         (void)Create(parent, id, style, name);
     }


@@ -30,7 +30,7 @@ public:
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
                 long style = wxST_SIZEGRIP,
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
                 long style = wxST_SIZEGRIP,

-                const wxString& name = wxEmptyString);
+                const wxString& name = wxStatusBarNameStr);

 
     virtual ~wxStatusBar95();
 
 
     virtual ~wxStatusBar95();
 


@@ -57,16 +57,16 @@ public:
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 

+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
+                                    WXWPARAM wParam,
+                                    WXLPARAM lParam);

 protected:
     void CopyFieldsWidth(const int widths[]);
     void SetFieldsWidth();
 
 protected:
     void CopyFieldsWidth(const int widths[]);
     void SetFieldsWidth();
 

-    // override base class virtual
-    void DoMoveWindow(int x, int y, int width, int height);
-
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
-                                    WXWPARAM wParam,
-                                    WXLPARAM lParam);
+    // override some base class virtuals
+    virtual wxSize DoGetBestSize() const;
+    virtual void DoMoveWindow(int x, int y, int width, int height);

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95)