More ribbon compilation fixes for OS X.

[wxWidgets.git] / include / wx / msw / statusbar.h

diff --git a/include/wx/msw/statusbar.h b/include/wx/msw/statusbar.h
index 8828b640e216f4b36c1d53a68f0ba7fa6fcfc4db..14e65d47af2d13c22287e640f0ccff84775529ad 100644 (file)
--- a/include/wx/msw/statusbar.h
+++ b/include/wx/msw/statusbar.h
@@ -14,6 +14,11 @@
 
 #if wxUSE_NATIVE_STATUSBAR
 
 
 #if wxUSE_NATIVE_STATUSBAR
 

+#include "wx/vector.h"
+#include "wx/tooltip.h"
+
+class WXDLLIMPEXP_FWD_CORE wxClientDC;
+

 class WXDLLIMPEXP_CORE wxStatusBar : public wxStatusBarBase
 {
 public:
 class WXDLLIMPEXP_CORE wxStatusBar : public wxStatusBarBase
 {
 public:


@@ -21,52 +26,57 @@ public:
     wxStatusBar();
     wxStatusBar(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
     wxStatusBar();
     wxStatusBar(wxWindow *parent,
                 wxWindowID id = wxID_ANY,

-                long style = wxST_SIZEGRIP,
+                long style = wxSTB_DEFAULT_STYLE,

                 const wxString& name = wxStatusBarNameStr)
     {
                 const wxString& name = wxStatusBarNameStr)
     {

+        m_pDC = NULL;

         (void)Create(parent, id, style, name);
     }
 
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
         (void)Create(parent, id, style, name);
     }
 
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,

-                long style = wxST_SIZEGRIP,
+                long style = wxSTB_DEFAULT_STYLE,

                 const wxString& name = wxStatusBarNameStr);
 
     virtual ~wxStatusBar();
 
                 const wxString& name = wxStatusBarNameStr);
 
     virtual ~wxStatusBar();
 

-    // a status line can have several (<256) fields numbered from 0
+    // implement base class methods

     virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
     virtual void SetFieldsCount(int number = 1, const int *widths = NULL);

-
-    // each field of status line has it's own text
-    virtual void     SetStatusText(const wxString& text, int number = 0);
-    virtual wxString GetStatusText(int number = 0) const;
-
-    // set status line fields' widths

     virtual void SetStatusWidths(int n, const int widths_field[]);
     virtual void SetStatusWidths(int n, const int widths_field[]);

-
-    // set status line fields' styles

     virtual void SetStatusStyles(int n, const int styles[]);
     virtual void SetStatusStyles(int n, const int styles[]);

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

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

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

-    // get the border size

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

+    // override some wxWindow virtual methods too
+    virtual bool SetFont(const wxFont& font);
+

     virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
                                     WXWPARAM wParam,
                                     WXLPARAM lParam);
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
                                     WXWPARAM wParam,
                                     WXLPARAM lParam);

+

 protected:
 protected:

-    void CopyFieldsWidth(const int widths[]);
-    void SetFieldsWidth();
+    // implement base class pure virtual method
+    virtual void DoUpdateStatusText(int number);

 
     // override some base class virtuals
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // override some base class virtuals
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);

+#if wxUSE_TOOLTIPS
+    virtual bool MSWProcessMessage(WXMSG* pMsg);
+    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result);
+#endif
+
+    // implementation of the public SetStatusWidths()
+    void MSWUpdateFieldsWidths();
+
+    // used by DoUpdateStatusText()
+    wxClientDC *m_pDC;
+
+    // the tooltips used when wxSTB_SHOW_TIPS is given
+    wxVector<wxToolTip*> m_tooltips;

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar)