allow handling events in a function taking the base class of the event class correspo...

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

diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h
index 85baa6e44fd904ff9c760469084ee6ac142450dd..dca76ee74bf8b703346520ee6b4aefb7156f7961 100644 (file)
--- a/include/wx/univ/statusbr.h
+++ b/include/wx/univ/statusbr.h
@@ -12,25 +12,21 @@
 #ifndef _WX_UNIV_STATUSBR_H_
 #define _WX_UNIV_STATUSBR_H_
 
 #ifndef _WX_UNIV_STATUSBR_H_
 #define _WX_UNIV_STATUSBR_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univstatusbr.h"
-#endif
-

 #include "wx/univ/inpcons.h"
 #include "wx/arrstr.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/univ/inpcons.h"
 #include "wx/arrstr.h"
 
 // ----------------------------------------------------------------------------

-// wxStatusBar: a window near the bottom of the frame used for status info
+// wxStatusBarUniv: a window near the bottom of the frame used for status info

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStatusBarUniv : public wxStatusBarBase,
+class WXDLLIMPEXP_CORE wxStatusBarUniv : public wxStatusBarBase,

                                     public wxInputConsumer
 {
 public:
     wxStatusBarUniv() { Init(); }
 
     wxStatusBarUniv(wxWindow *parent,
                                     public wxInputConsumer
 {
 public:
     wxStatusBarUniv() { Init(); }
 
     wxStatusBarUniv(wxWindow *parent,

-                    wxWindowID id = -1,
+                    wxWindowID id = wxID_ANY,

                     long style = 0,
                     const wxString& name = wxPanelNameStr)
     {
                     long style = 0,
                     const wxString& name = wxPanelNameStr)
     {


@@ -40,7 +36,7 @@ public:
     }
 
     bool Create(wxWindow *parent,
     }
 
     bool Create(wxWindow *parent,

-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,

                 long style = 0,
                 const wxString& name = wxPanelNameStr);
 
                 long style = 0,
                 const wxString& name = wxPanelNameStr);
 


@@ -62,6 +58,10 @@ public:
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 

+    // wxInputConsumer pure virtual
+    virtual wxWindow *GetInputWindow() const
+        { return const_cast<wxStatusBar*>(this); }
+

 protected:
     // recalculate the field widths
     void OnSize(wxSizeEvent& event);
 protected:
     // recalculate the field widths
     void OnSize(wxSizeEvent& event);


@@ -69,10 +69,6 @@ protected:
     // draw the statusbar
     virtual void DoDraw(wxControlRenderer *renderer);
 
     // draw the statusbar
     virtual void DoDraw(wxControlRenderer *renderer);
 

-    // wxInputConsumer pure virtual
-    virtual wxWindow *GetInputWindow() const
-        { return wxConstCast(this, wxStatusBar); }
-

     // tell them about our preferred height
     virtual wxSize DoGetBestSize() const;
 
     // tell them about our preferred height
     virtual wxSize DoGetBestSize() const;
 


@@ -99,7 +95,7 @@ protected:
     void Init();
 
 private:
     void Init();
 
 private:

-    // the status fields strings
+    // the current status fields strings

     wxArrayString m_statusText;
 
     // the absolute status fields widths
     wxArrayString m_statusText;
 
     // the absolute status fields widths