Don't use invoking window in wxGTK wxMenuBar implementation.

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

diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h
index e4e1cfe8a99fe035b3d9b84d649dc2b81fdbfb3e..52dc440acf564057085ecc3acea3efddb7b7f2fc 100644 (file)
--- a/include/wx/univ/statusbr.h
+++ b/include/wx/univ/statusbr.h
@@ -20,14 +20,14 @@
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxStatusBarUniv : public wxStatusBarBase,
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxStatusBarUniv : public wxStatusBarBase,

-                                    public wxInputConsumer
+                                         public wxInputConsumer

 {
 public:
     wxStatusBarUniv() { Init(); }
 
     wxStatusBarUniv(wxWindow *parent,
                     wxWindowID id = wxID_ANY,
 {
 public:
     wxStatusBarUniv() { Init(); }
 
     wxStatusBarUniv(wxWindow *parent,
                     wxWindowID id = wxID_ANY,

-                    long style = wxST_DEFAULT_STYLE,
+                    long style = wxSTB_DEFAULT_STYLE,

                     const wxString& name = wxPanelNameStr)
     {
         Init();
                     const wxString& name = wxPanelNameStr)
     {
         Init();


@@ -37,23 +37,16 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
 
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,

-                long style = wxST_DEFAULT_STYLE,
+                long style = wxSTB_DEFAULT_STYLE,

                 const wxString& name = wxPanelNameStr);
 
                 const wxString& name = wxPanelNameStr);
 

-    // set field count/widths
+    // implement base class methods

     virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
     virtual void SetStatusWidths(int n, const int widths[]);
 
     virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
     virtual void SetStatusWidths(int n, const int widths[]);
 

-    // get/set the text of the given field
-    virtual void SetStatusText(const wxString& text, int number = 0);
-
-    // Get the position and size of the field's internal bounding rectangle

     virtual bool GetFieldRect(int i, wxRect& rect) const;
     virtual bool GetFieldRect(int i, wxRect& rect) const;

-
-    // sets the minimal vertical size of the status bar

     virtual void SetMinHeight(int height);
 
     virtual void SetMinHeight(int height);
 

-    // get the dimensions of the horizontal and vertical borders

     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 


@@ -62,6 +55,8 @@ public:
         { return const_cast<wxStatusBar*>(this); }
 
 protected:
         { return const_cast<wxStatusBar*>(this); }
 
 protected:

+    virtual void DoUpdateStatusText(int i);
+

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


@@ -87,9 +82,6 @@ protected:
     // get the rect for this field without ani side effects (see code)
     wxRect DoGetFieldRect(int n) const;
 
     // get the rect for this field without ani side effects (see code)
     wxRect DoGetFieldRect(int n) const;
 

-    // refresh the given field
-    void RefreshField(int i);
-

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();