X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..e2badebb8fad5ee453fada24f336c275df9f216b:/include/wx/generic/statusbr.h

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index fe00d93e30..4cdae345f7 100644
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -5,125 +5,103 @@
 // 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
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "statusbr.h"
-#endif
+#include "wx/defs.h"
 
-#include "wx/pen.h"
-#include "wx/font.h"
-#include "wx/statusbr.h"
+#if wxUSE_STATUSBAR
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+#include "wx/pen.h"
+#include "wx/arrstr.h"
 
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
 public:
-  wxStatusBarGeneric() { Init(); }
-  wxStatusBarGeneric(wxWindow *parent,
-              wxWindowID id,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = 0,
-              const wxString& name = wxPanelNameStr)
-  {
-      Init();
-
-      Create(parent, id, pos, size, style, name);
-  }
-  wxStatusBarGeneric(wxWindow *parent,
-                     wxWindowID id,
-                     long style,
-                     const wxString& name = wxPanelNameStr)
-  {
-      Init();
-
-      Create(parent, id, style, name);
-  }
-
-  virtual ~wxStatusBarGeneric();
-
-  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,
-              long style,
-              const wxString& name = wxPanelNameStr);
-
-  // Create status line
-  virtual void SetFieldsCount(int number = 1,
-                              const int *widths = (const int *) NULL);
-
-  // Set status line text
-  virtual void SetStatusText(const wxString& text, int number = 0);
-  virtual wxString GetStatusText(int number = 0) const;
-
-  // Set status line widths
-  virtual void SetStatusWidths(int n, const int widths_field[]);
-
-  // Get the position and size of the field's internal bounding rectangle
-  virtual bool GetFieldRect(int i, wxRect& rect) const;
-
-  // 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);
-  
-  void OnLeftDown(wxMouseEvent& event);
-  void OnRightDown(wxMouseEvent& event);
-
-  virtual void InitColours();
-
-  // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
+    wxStatusBarGeneric() { Init(); }
+    wxStatusBarGeneric(wxWindow *parent,
+                       wxWindowID winid = wxID_ANY,
+                       long style = wxST_SIZEGRIP,
+                       const wxString& name = wxStatusBarNameStr)
+    {
+        Init();
+
+        Create(parent, winid, style, name);
+    }
+
+    virtual ~wxStatusBarGeneric();
+
+    bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
+                long style = wxST_SIZEGRIP,
+                const wxString& name = wxStatusBarNameStr);
+
+    // Create status line
+    virtual void SetFieldsCount(int number = 1,
+                                const int *widths = (const int *) NULL);
+
+    // Set status line text
+    virtual void SetStatusText(const wxString& text, int number = 0);
+    virtual wxString GetStatusText(int number = 0) const;
+
+    // Set status line widths
+    virtual void SetStatusWidths(int n, const int widths_field[]);
+
+    // Get the position and size of the field's internal bounding rectangle
+    virtual bool GetFieldRect(int i, wxRect& rect) const;
+
+    // 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);
+
+    void OnLeftDown(wxMouseEvent& event);
+    void OnRightDown(wxMouseEvent& event);
+
+    virtual void InitColours();
+
+    // Responds to colour changes
+    void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 protected:
-  // common part of all ctors
-  void Init();
+    // common part of all ctors
+    void Init();
+
+    wxArrayString     m_statusStrings;
 
-  wxArrayString     m_statusStrings;
+    // the last known width of the client rect (used to rebuild cache)
+    int               m_lastClientWidth;
+    // the widths of the status bar panes in pixels
+    wxArrayInt        m_widthsAbs;
 
-  // the last known width of the client rect (used to rebuild cache)
-  int               m_lastClientWidth;
-  // the widths of the status bar panes in pixels
-  wxArrayInt        m_widthsAbs;
+    int               m_borderX;
+    int               m_borderY;
+    wxPen             m_mediumShadowPen;
+    wxPen             m_hilightPen;
 
-  int               m_borderX;
-  int               m_borderY;
-  wxFont            m_defaultStatusBarFont;
-  wxPen             m_mediumShadowPen;
-  wxPen             m_hilightPen;
+    virtual wxSize DoGetBestSize() const;
 
 private:
-  DECLARE_EVENT_TABLE()
-  DECLARE_DYNAMIC_CLASS(wxStatusBarGeneric)
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)
 };
 
+#endif // wxUSE_STATUSBAR
+
 #endif
     // _WX_GENERIC_STATUSBR_H_
-
-// vi:sts=4:sw=4:et