X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed7919869508ccd5c868683c28706f82e82a1b9b..e1aae5288576cd0066d2cbbf92935a969110bcea:/include/wx/generic/statusbr.h

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index e66edd0e43..fe00d93e30 100644
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -12,19 +12,20 @@
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "statusbr.h"
 #endif
 
 #include "wx/pen.h"
 #include "wx/font.h"
+#include "wx/statusbr.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
 public:
-  wxStatusBarGeneric();
+  wxStatusBarGeneric() { Init(); }
   wxStatusBarGeneric(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
@@ -32,17 +33,21 @@ public:
               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)
+                     wxWindowID id,
+                     long style,
+                     const wxString& name = wxPanelNameStr)
   {
+      Init();
+
       Create(parent, id, style, name);
   }
 
-  ~wxStatusBarGeneric();
+  virtual ~wxStatusBarGeneric();
 
   bool Create(wxWindow *parent, wxWindowID id,
               const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
@@ -54,13 +59,12 @@ public:
   }
 
   bool Create(wxWindow *parent, wxWindowID id,
-              long style = 0,
+              long style,
               const wxString& name = wxPanelNameStr);
 
   // Create status line
   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);
@@ -88,6 +92,9 @@ public:
   void SetBorderY(int y);
 
   void OnPaint(wxPaintEvent& event);
+  
+  void OnLeftDown(wxMouseEvent& event);
+  void OnRightDown(wxMouseEvent& event);
 
   virtual void InitColours();
 
@@ -95,7 +102,16 @@ public:
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 protected:
-  wxString *        m_statusStrings;
+  // common part of all ctors
+  void Init();
+
+  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;
+
   int               m_borderX;
   int               m_borderY;
   wxFont            m_defaultStatusBarFont;
@@ -109,3 +125,5 @@ private:
 
 #endif
     // _WX_GENERIC_STATUSBR_H_
+
+// vi:sts=4:sw=4:et