Commit Carsten Fuchs' patch for separating wxGLCanvas

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

diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h
index b84a016a6a9bfbe0f070668d466b4cb23bc1d553..e611e4a00ac1f60bd6d7b63cdafb96aec8750309 100644 (file)
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -12,10 +12,6 @@
 #ifndef   _STATBR95_H
 #define   _STATBR95_H
 
-#ifdef __GNUG__
-#pragma interface "statbr95.h"
-#endif
-
 #if wxUSE_NATIVE_STATUSBAR
 
 class WXDLLEXPORT wxStatusBar95 : public wxStatusBarBase
@@ -24,7 +20,7 @@ public:
     // ctors and such
     wxStatusBar95();
     wxStatusBar95(wxWindow *parent,
-                  wxWindowID id = -1,
+                  wxWindowID id = wxID_ANY,
                   long style = wxST_SIZEGRIP,
                   const wxString& name = wxEmptyString)
     {
@@ -32,7 +28,7 @@ public:
     }
 
     bool Create(wxWindow *parent,
-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,
                 long style = wxST_SIZEGRIP,
                 const wxString& name = wxEmptyString);
 
@@ -48,6 +44,9 @@ public:
     // set status line fields' widths
     virtual void SetStatusWidths(int n, const int widths_field[]);
 
+    // set status line fields' styles
+    virtual void SetStatusStyles(int n, const int styles[]);
+
     // sets the minimal vertical size of the status bar
     virtual void SetMinHeight(int height);
 
@@ -58,15 +57,18 @@ public:
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 
-    void OnSize(wxSizeEvent& event);
-
+    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);
+
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxStatusBar95);
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95)
 };
 
 #endif  // wxUSE_NATIVE_STATUSBAR