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 fc08061abf1692d2674acc5f9e580d25b8257f7e..9b07b714693be60530df6d1fb811f79ed6088ba9 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -5,8 +5,8 @@
 // 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_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_STATUSBR_H_


@@ -27,7 +27,7 @@ class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 public:
   wxStatusBarGeneric() { Init(); }
   wxStatusBarGeneric(wxWindow *parent,
 public:
   wxStatusBarGeneric() { Init(); }
   wxStatusBarGeneric(wxWindow *parent,

-              wxWindowID id,
+              wxWindowID winid,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,


@@ -35,30 +35,30 @@ public:
   {
       Init();
 
   {
       Init();
 

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

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

-                     wxWindowID id,
+                     wxWindowID winid,

                      long style,
                      const wxString& name = wxPanelNameStr)
   {
       Init();
 
                      long style,
                      const wxString& name = wxPanelNameStr)
   {
       Init();
 

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

   }
 
   virtual ~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);
 
               long style,
               const wxString& name = wxPanelNameStr);
 


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

-  void OnSize(wxSizeEvent& event);
+  
+  void OnLeftDown(wxMouseEvent& event);
+  void OnRightDown(wxMouseEvent& event);

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


@@ -105,6 +107,8 @@ protected:
 
   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 widths of the status bar panes in pixels
   wxArrayInt        m_widthsAbs;