reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h
index 7bc28a7fe181f250627ff999a213269bf55f73bd..f6f56cfe1d065beaed50ff9d0b40a41bf665df45 100644 (file)
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -2,11 +2,11 @@
 // Name:        msw/statbr95.h
 // Purpose:     native implementation of wxStatusBar
 // Author:      Vadim Zeitlin
 // Name:        msw/statbr95.h
 // Purpose:     native implementation of wxStatusBar
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     04.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     04.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _STATBR95_H
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _STATBR95_H


@@ -16,40 +16,59 @@
 #pragma interface "statbr95.h"
 #endif
 
 #pragma interface "statbr95.h"
 #endif
 

-#if       USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

 
 

-class WXDLLEXPORT wxStatusBar95 : public wxStatusBar
+class WXDLLEXPORT wxStatusBar95 : public wxStatusBarBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxStatusBar95);
-

 public:
 public:

-  // ctors
-  wxStatusBar95();
-  wxStatusBar95(wxWindow *parent, wxWindowID id = -1, long style = wxST_SIZEGRIP);
+    // ctors and such
+    wxStatusBar95();
+    wxStatusBar95(wxWindow *parent,
+                  wxWindowID id = -1,
+                  long style = wxST_SIZEGRIP,
+                  const wxString& name = wxEmptyString)
+    {
+        (void)Create(parent, id, style, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = -1,
+                long style = wxST_SIZEGRIP,
+                const wxString& name = wxEmptyString);
+
+    virtual ~wxStatusBar95();

 
 

-  // create status line
-  bool Create(wxWindow *parent, wxWindowID id = -1, long style = wxST_SIZEGRIP);
+    // a status line can have several (<256) fields numbered from 0
+    virtual void SetFieldsCount(int number = 1, const int *widths = NULL);

 
 

-  // a status line can have several (<256) fields numbered from 0
-  virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
+    // each field of status line has it's own text
+    virtual void     SetStatusText(const wxString& text, int number = 0);
+    virtual wxString GetStatusText(int number = 0) const;

 
 

-  // each field of status line has it's own text
-  virtual void     SetStatusText(const wxString& text, const int number = 0);
-  virtual wxString GetStatusText(int number = 0) const;
+    // 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);
+    // sets the minimal vertical size of the status bar
+    virtual void SetMinHeight(int height);

 
 

-  // we're going to process WM_SIZE (of the parent window)
-  void OnSize(wxSizeEvent& event);
+    // get the position and size of the field's internal bounding rectangle
+    virtual bool GetFieldRect(int i, wxRect& rect) const;

 
 

-  DECLARE_EVENT_TABLE()
+    // get the border size
+    virtual int GetBorderX() const;
+    virtual int GetBorderY() const;

 
 protected:
 
 protected:

-  void CopyFieldsWidth(const int *widths);
-  void SetFieldsWidth();
+    void CopyFieldsWidth(const int widths[]);
+    void SetFieldsWidth();
+
+    // override base class virtual
+    void DoMoveWindow(int x, int y, int width, int height);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxStatusBar95);

 };
 
 };
 

-#endif  // USE_NATIVE_STATUSBAR
+#endif  // wxUSE_NATIVE_STATUSBAR

 
 

-#endif  //_STATBR95_H
\ No newline at end of file
+#endif