X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c07103f267adc57a49d2fffa12acdd06b3ff7a57..f196316400fd247a760b2ef77d5064b4e10e5471:/include/wx/msw/statbr95.h?ds=sidebyside

diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h
index 022c4e51ee..3b26a1fa3a 100644
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -12,10 +12,6 @@
 #ifndef   _STATBR95_H
 #define   _STATBR95_H
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "statbr95.h"
-#endif
-
 #if wxUSE_NATIVE_STATUSBAR
 
 class WXDLLEXPORT wxStatusBar95 : public wxStatusBarBase
@@ -26,7 +22,7 @@ public:
     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);
     }
@@ -34,7 +30,7 @@ public:
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
                 long style = wxST_SIZEGRIP,
-                const wxString& name = wxEmptyString);
+                const wxString& name = wxStatusBarNameStr);
 
     virtual ~wxStatusBar95();
 
@@ -61,16 +57,16 @@ public:
     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();
 
-    // 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)