no real change; just add the standard separator where it's missing

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 06c8ec47914892006881da2fe97336e639638235..13d309423c0a4c37c358febdc62a0aca48a22e94 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -12,114 +12,109 @@
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 

+#include "wx/defs.h"
+
+#if wxUSE_STATUSBAR
+

 #include "wx/pen.h"
 #include "wx/pen.h"

-#include "wx/font.h"
-#include "wx/statusbr.h"

 #include "wx/arrstr.h"
 
 #include "wx/arrstr.h"
 

-extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];

 
 

-class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
+// ----------------------------------------------------------------------------
+// wxStatusBarGeneric
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxStatusBarGeneric : public wxStatusBarBase

 {
 public:
 {
 public:

-  wxStatusBarGeneric() { Init(); }
-  wxStatusBarGeneric(wxWindow *parent,
-              wxWindowID winid,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = wxFULL_REPAINT_ON_RESIZE,
-              const wxString& name = wxPanelNameStr)
-  {
-      Init();
+    wxStatusBarGeneric() { Init(); }
+    wxStatusBarGeneric(wxWindow *parent,
+                       wxWindowID winid = wxID_ANY,
+                       long style = wxST_SIZEGRIP,
+                       const wxString& name = wxStatusBarNameStr)
+    {
+        Init();
+
+        Create(parent, winid, style, name);
+    }

 
 

-      Create(parent, winid, pos, size, style, name);
-  }
-  wxStatusBarGeneric(wxWindow *parent,
-                     wxWindowID winid,
-                     long style,
-                     const wxString& name = wxPanelNameStr)
-  {
-      Init();
+    virtual ~wxStatusBarGeneric();

 
 

-      Create(parent, winid, style, name);
-  }
+    bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
+                long style = wxST_SIZEGRIP,
+                const wxString& name = wxStatusBarNameStr);

 
 

-  virtual ~wxStatusBarGeneric();
+    // Create status line
+    virtual void SetFieldsCount(int number = 1,
+                                const int *widths = (const int *) NULL);

 
 

-  bool Create(wxWindow *parent, wxWindowID winid,
-              const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
-              const wxSize& WXUNUSED(size) = wxDefaultSize,
-              long style = wxFULL_REPAINT_ON_RESIZE,
-              const wxString& name = wxPanelNameStr)
-  {
-      return Create(parent, winid, style, name);
-  }
+    // Set status line text
+    virtual void SetStatusText(const wxString& text, int number = 0);

 
 

-  bool Create(wxWindow *parent, wxWindowID winid,
-              long style,
-              const wxString& name = wxPanelNameStr);
+    // Set status line widths
+    virtual void SetStatusWidths(int n, const int widths_field[]);

 
 

-  // Create status line
-  virtual void SetFieldsCount(int number = 1,
-                              const int *widths = (const int *) NULL);
+    // Get the position and size of the field's internal bounding rectangle
+    virtual bool GetFieldRect(int i, wxRect& rect) const;

 
 

-  // Set status line text
-  virtual void SetStatusText(const wxString& text, int number = 0);
-  virtual wxString GetStatusText(int number = 0) const;
+    // sets the minimal vertical size of the status bar
+    virtual void SetMinHeight(int height);

 
 

-  // Set status line widths
-  virtual void SetStatusWidths(int n, const int widths_field[]);
+    virtual int GetBorderX() const { return m_borderX; }
+    virtual int GetBorderY() const { return m_borderY; }

 
 

-  // 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);
+protected:      // event handlers

 
 

-  virtual int GetBorderX() const { return m_borderX; }
-  virtual int GetBorderY() const { return m_borderY; }
+    void OnPaint(wxPaintEvent& event);
+    void OnSize(wxSizeEvent& event);

 
 

-  ////////////////////////////////////////////////////////////////////////
-  // Implementation
+    void OnLeftDown(wxMouseEvent& event);
+    void OnRightDown(wxMouseEvent& event);

 
 

-  virtual void DrawFieldText(wxDC& dc, int i);
-  virtual void DrawField(wxDC& dc, int i);
+    // Responds to colour changes
+    void OnSysColourChanged(wxSysColourChangedEvent& event);

 
 

-  void SetBorderX(int x);
-  void SetBorderY(int y);
+protected:

 
 

-  void OnPaint(wxPaintEvent& event);
+    virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight);
+    virtual void DrawField(wxDC& dc, int i, int textHeight);

 
 

-  void OnLeftDown(wxMouseEvent& event);
-  void OnRightDown(wxMouseEvent& event);
+    void SetBorderX(int x);
+    void SetBorderY(int y);

 
 

-  virtual void InitColours();
+    virtual void InitColours();

 
 

-  // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
+    // true if the status bar shows the size grip: for this it must have
+    // wxST_SIZEGRIP style and the window it is attached to must be resizeable
+    // and not maximized
+    bool ShowsSizeGrip() const;

 
 

-protected:
-  // common part of all ctors
-  void Init();
+    // returns the position and the size of the size grip
+    wxRect GetSizeGripRect() const;

 
 

-  wxArrayString     m_statusStrings;
+    // common part of all ctors
+    void Init();

 
 

-  // 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 height of the client rect
+    int               m_lastClientHeight;

 
 

-  int               m_borderX;
-  int               m_borderY;
-  wxPen             m_mediumShadowPen;
-  wxPen             m_hilightPen;
+    // the absolute widths of the status bar panes in pixels
+    wxArrayInt        m_widthsAbs;

 
 

-  virtual wxSize DoGetBestSize() const;
+    int               m_borderX;
+    int               m_borderY;
+    wxPen             m_mediumShadowPen;
+    wxPen             m_hilightPen;
+
+    virtual wxSize DoGetBestSize() const;

 
 private:
 
 private:

-  DECLARE_EVENT_TABLE()
-  DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)

 };
 
 };
 

+#endif // wxUSE_STATUSBAR
+

 #endif
     // _WX_GENERIC_STATUSBR_H_
 #endif
     // _WX_GENERIC_STATUSBR_H_