Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h
index dd39aea1d5f4bcb7273e84f79e777857dfdbdd77..f2b70c477fb746fef616b86c61b9e2d117109322 100644 (file)
--- a/include/wx/osx/statusbr.h
+++ b/include/wx/osx/statusbr.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/carbon/statusbr.h
+// Name:        wx/osx/statusbr.h

 // Purpose:     native implementation of wxStatusBar.
 //              Optional: can use generic version instead.
 // Author:      Stefan Csomor
 // Purpose:     native implementation of wxStatusBar.
 //              Optional: can use generic version instead.
 // Author:      Stefan Csomor


@@ -15,29 +15,28 @@
 
 class WXDLLIMPEXP_CORE wxStatusBarMac : public wxStatusBarGeneric
 {
 
 class WXDLLIMPEXP_CORE wxStatusBarMac : public wxStatusBarGeneric
 {

-    DECLARE_DYNAMIC_CLASS(wxStatusBarMac)
-
+public:

     wxStatusBarMac();
     wxStatusBarMac(wxWindow *parent, wxWindowID id = wxID_ANY,
     wxStatusBarMac();
     wxStatusBarMac(wxWindow *parent, wxWindowID id = wxID_ANY,

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

            const wxString& name = wxStatusBarNameStr);
 
     virtual ~wxStatusBarMac();
 
     bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
            const wxString& name = wxStatusBarNameStr);
 
     virtual ~wxStatusBarMac();
 
     bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,

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

               const wxString& name = wxStatusBarNameStr);
 
               const wxString& name = wxStatusBarNameStr);
 

-    virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight);
-    virtual void DrawField(wxDC& dc, int i, int textHeight);
-
-    virtual void SetStatusText(const wxString& text, int number = 0);
-

     // Implementation
     virtual void MacHiliteChanged();
     void OnPaint(wxPaintEvent& event);
 
 protected:
     // Implementation
     virtual void MacHiliteChanged();
     void OnPaint(wxPaintEvent& event);
 
 protected:

+    virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight);
+    virtual void DrawField(wxDC& dc, int i, int textHeight);
+    virtual void DoUpdateStatusText(int number = 0);
+
+    DECLARE_DYNAMIC_CLASS(wxStatusBarMac)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };