set eol-style

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

diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h
index 66446448db2f8017b776a0d898883278a495cbdb..3b26a1fa3adba4c9661e66bc09e57a9268741551 100644 (file)
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -12,10 +12,6 @@
 #ifndef   _STATBR95_H
 #define   _STATBR95_H
 
 #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
 #if wxUSE_NATIVE_STATUSBAR
 
 class WXDLLEXPORT wxStatusBar95 : public wxStatusBarBase


@@ -24,17 +20,17 @@ public:
     // ctors and such
     wxStatusBar95();
     wxStatusBar95(wxWindow *parent,
     // ctors and such
     wxStatusBar95();
     wxStatusBar95(wxWindow *parent,

-                  wxWindowID id = -1,
+                  wxWindowID id = wxID_ANY,

                   long style = wxST_SIZEGRIP,
                   long style = wxST_SIZEGRIP,

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

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

-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,

                 long style = wxST_SIZEGRIP,
                 long style = wxST_SIZEGRIP,

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

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


@@ -48,6 +44,9 @@ public:
     // set status line fields' widths
     virtual void SetStatusWidths(int n, const int widths_field[]);
 
     // 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);
 
     // sets the minimal vertical size of the status bar
     virtual void SetMinHeight(int height);
 


@@ -58,12 +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);
+    // 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)