added wxMAKE_UNIQUE_NAME to wx/defs.h, use it in wx/debug.h

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index b0d27f3ca901e49b2a0ec05aadc6cf82bce94f49..9b07b714693be60530df6d1fb811f79ed6088ba9 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -5,14 +5,14 @@
 // Modified by: VZ at 05.02.00 to derive from wxStatusBarBase
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "statusbr.h"
 #endif
 
 #pragma interface "statusbr.h"
 #endif
 


@@ -25,43 +25,46 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
 public:
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
 public:

-  wxStatusBarGeneric();
+  wxStatusBarGeneric() { Init(); }

   wxStatusBarGeneric(wxWindow *parent,
   wxStatusBarGeneric(wxWindow *parent,

-              wxWindowID id,
+              wxWindowID winid,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxString& name = wxPanelNameStr)
   {
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxString& name = wxPanelNameStr)
   {

-      Create(parent, id, pos, size, style, name);
+      Init();
+
+      Create(parent, winid, pos, size, style, name);

   }
   wxStatusBarGeneric(wxWindow *parent,
   }
   wxStatusBarGeneric(wxWindow *parent,

-              wxWindowID id,
-              long style,
-              const wxString& name = wxPanelNameStr)
+                     wxWindowID winid,
+                     long style,
+                     const wxString& name = wxPanelNameStr)

   {
   {

-      Create(parent, id, style, name);
+      Init();
+
+      Create(parent, winid, style, name);

   }
 
   }
 

-  ~wxStatusBarGeneric();
+  virtual ~wxStatusBarGeneric();

 
 

-  bool Create(wxWindow *parent, wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID winid,

               const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
               const wxSize& WXUNUSED(size) = wxDefaultSize,
               long style = 0,
               const wxString& name = wxPanelNameStr)
   {
               const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
               const wxSize& WXUNUSED(size) = wxDefaultSize,
               long style = 0,
               const wxString& name = wxPanelNameStr)
   {

-      return Create(parent, id, style, name);
+      return Create(parent, winid, style, name);

   }
 
   }
 

-  bool Create(wxWindow *parent, wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID winid,

               long style,
               const wxString& name = wxPanelNameStr);
 
   // Create status line
   virtual void SetFieldsCount(int number = 1,
                               const int *widths = (const int *) NULL);
               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);
 
   // Set status line text
   virtual void SetStatusText(const wxString& text, int number = 0);


@@ -89,6 +92,9 @@ public:
   void SetBorderY(int y);
 
   void OnPaint(wxPaintEvent& event);
   void SetBorderY(int y);
 
   void OnPaint(wxPaintEvent& event);

+  
+  void OnLeftDown(wxMouseEvent& event);
+  void OnRightDown(wxMouseEvent& event);

 
   virtual void InitColours();
 
 
   virtual void InitColours();
 


@@ -96,7 +102,16 @@ public:
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 protected:
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 protected:

+  // 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;
+

   int               m_borderX;
   int               m_borderY;
   wxFont            m_defaultStatusBarFont;
   int               m_borderX;
   int               m_borderY;
   wxFont            m_defaultStatusBarFont;