reverted Julian's unintentional breakage of wxChoice

[wxWidgets.git] / include / wx / generic / statusbr.h

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 0c858300287fc764c4793b4f6f7d45ddea17af2d..47a834f1c1466d30b2c53af5b0007f5304da63b5 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -1,53 +1,67 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statusbr.h
-// Purpose:     wxStatusBar class
+// Name:        wx/generic/statusbr.h
+// Purpose:     wxStatusBarGeneric class
 // Author:      Julian Smart
-// Modified by:
+// Modified by: VZ at 05.02.00 to derive from wxStatusBarBase
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __STATUSBRH_G__
-#define __STATUSBRH_G__
+#ifndef _WX_GENERIC_STATUSBR_H_
+#define _WX_GENERIC_STATUSBR_H_
 
 #ifdef __GNUG__
 #pragma interface "statusbr.h"
 #endif
 
-#include "wx/window.h"
 #include "wx/pen.h"
 #include "wx/font.h"
+#include "wx/statusbr.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
-class WXDLLEXPORT wxStatusBar: public wxWindow
+class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
-  DECLARE_DYNAMIC_CLASS(wxStatusBar)
-
 public:
-  wxStatusBar(void);
-  inline wxStatusBar(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxPanelNameStr)
+  wxStatusBarGeneric();
+  wxStatusBarGeneric(wxWindow *parent,
+              wxWindowID id,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = 0,
+              const wxString& name = wxPanelNameStr)
   {
       Create(parent, id, pos, size, style, name);
   }
+  wxStatusBarGeneric(wxWindow *parent,
+              wxWindowID id,
+              long style,
+              const wxString& name = wxPanelNameStr)
+  {
+      Create(parent, id, style, name);
+  }
+
+  ~wxStatusBarGeneric();
 
-  ~wxStatusBar();
+  bool Create(wxWindow *parent, wxWindowID id,
+              const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
+              const wxSize& WXUNUSED(size) = wxDefaultSize,
+              long style = 0,
+              const wxString& name = wxPanelNameStr)
+  {
+      return Create(parent, id, style, name);
+  }
 
   bool Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxPanelNameStr);
+              long style,
+              const wxString& name = wxPanelNameStr);
 
   // Create status line
-  virtual void SetFieldsCount(int number=1, const int widths[] = (const int *) NULL);
-  inline int GetFieldsCount() const { return m_nFields; }
+  virtual void SetFieldsCount(int number = 1,
+                              const int *widths = (const int *) NULL);
+  int GetFieldsCount() const { return m_nFields; }
 
   // Set status line text
   virtual void SetStatusText(const wxString& text, int number = 0);
@@ -56,20 +70,24 @@ public:
   // Set status line widths
   virtual void SetStatusWidths(int n, const int widths_field[]);
 
-  virtual void DrawFieldText(wxDC& dc, int i);
-  virtual void DrawField(wxDC& dc, int i);
-
   // Get the position and size of the field's internal bounding rectangle
   virtual bool GetFieldRect(int i, wxRect& rect) const;
 
-  inline int GetBorderX() const { return m_borderX; }
-  inline int GetBorderY() const { return m_borderY; }
-  inline void SetBorderX(int x);
-  inline void SetBorderY(int y);
+  // sets the minimal vertical size of the status bar
+  virtual void SetMinHeight(int height);
+
+  virtual int GetBorderX() const { return m_borderX; }
+  virtual int GetBorderY() const { return m_borderY; }
 
   ////////////////////////////////////////////////////////////////////////
   // Implementation
 
+  virtual void DrawFieldText(wxDC& dc, int i);
+  virtual void DrawField(wxDC& dc, int i);
+
+  void SetBorderX(int x);
+  void SetBorderY(int y);
+
   void OnPaint(wxPaintEvent& event);
 
   virtual void InitColours();
@@ -78,8 +96,6 @@ public:
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 protected:
-  int *             m_statusWidths;
-  int               m_nFields;
   wxString *        m_statusStrings;
   int               m_borderX;
   int               m_borderY;
@@ -87,8 +103,10 @@ protected:
   wxPen             m_mediumShadowPen;
   wxPen             m_hilightPen;
 
+private:
   DECLARE_EVENT_TABLE()
+  DECLARE_DYNAMIC_CLASS(wxStatusBarGeneric)
 };
 
 #endif
-    // __STATUSBRH_G__
+    // _WX_GENERIC_STATUSBR_H_