Return old, not new, selection from wxMSW wxNotebook::ChangeSelection().

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

diff --git a/include/wx/msw/statusbar.h b/include/wx/msw/statusbar.h
index 4b4677c0f3b1375e5f72533ca199d098789a4824..e942dd56b990582187531825fb1c940cd391cf28 100644 (file)
--- a/include/wx/msw/statusbar.h
+++ b/include/wx/msw/statusbar.h
@@ -14,6 +14,9 @@
 
 #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
 class WXDLLIMPEXP_FWD_CORE wxClientDC;
 
 class WXDLLIMPEXP_CORE wxStatusBar : public wxStatusBarBase


@@ -23,7 +26,7 @@ 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)
     {
         m_pDC = NULL;
                 const wxString& name = wxStatusBarNameStr)
     {
         m_pDC = NULL;


@@ -32,51 +35,72 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
 
     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);
-
-    // 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 bool SetFont(const wxFont& font);
 
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
                                     WXWPARAM wParam,
                                     WXLPARAM lParam);

+

 protected:
 protected:

-    void CopyFieldsWidth(const int widths[]);
-    void SetFieldsWidth();
-    void UpdateFieldText(int nField);
+    // 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 UpdateFieldText
+    // used by DoUpdateStatusText()

     wxClientDC *m_pDC;
 
     wxClientDC *m_pDC;
 

+    // the tooltips used when wxSTB_SHOW_TIPS is given
+    wxVector<wxToolTip*> m_tooltips;
+

 private:
 private:

+    struct MSWBorders
+    {
+        int horz,
+            vert,
+            between;
+    };
+
+    // retrieve all status bar borders using SB_GETBORDERS
+    MSWBorders MSWGetBorders() const;
+
+    // return the size of the border between the fields
+    int MSWGetBorderWidth() const;
+
+    struct MSWMetrics
+    {
+        int gripWidth,
+            textMargin;
+    };
+
+    // return the various status bar metrics
+    static const MSWMetrics& MSWGetMetrics();
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar)
 };