allow passing temporary functors to Bind() too (closes #10653)

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

diff --git a/include/wx/msw/statusbar.h b/include/wx/msw/statusbar.h
index 55a1f16c83ab060bce03c3ea3148451f0f9e8747..4d148481b541568bf10d38ad090d6b4cc86e497f 100644 (file)
--- a/include/wx/msw/statusbar.h
+++ b/include/wx/msw/statusbar.h
@@ -14,7 +14,10 @@
 
 #if wxUSE_NATIVE_STATUSBAR
 
 
 #if wxUSE_NATIVE_STATUSBAR
 

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

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


@@ -23,15 +26,16 @@ 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();


@@ -40,7 +44,7 @@ public:
     virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
 
     // each field of status line has it's own text
     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 void SetStatusText(const wxString& text, int number = 0);

 
     // set status line fields' widths
     virtual void SetStatusWidths(int n, const int widths_field[]);
 
     // set status line fields' widths
     virtual void SetStatusWidths(int n, const int widths_field[]);


@@ -63,6 +67,7 @@ public:
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
                                     WXWPARAM wParam,
                                     WXLPARAM lParam);
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
                                     WXWPARAM wParam,
                                     WXLPARAM lParam);

+

 protected:
     void CopyFieldsWidth(const int widths[]);
     void SetFieldsWidth();
 protected:
     void CopyFieldsWidth(const int widths[]);
     void SetFieldsWidth();


@@ -71,10 +76,17 @@ protected:
     // 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

 
     // used by UpdateFieldText
     wxClientDC *m_pDC;
 
 
     // used by UpdateFieldText
     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)
 };