Deallocate wxThreadSpecificInfo when wxThread ends.

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

diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h
index 070ce3b31e4375ed11c3ee099d9a428bc476b180..74ae67758c9acd8823382cbeec7ead89f3bd1d4f 100644 (file)
--- a/include/wx/osx/statusbr.h
+++ b/include/wx/osx/statusbr.h
@@ -1,11 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// 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
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -15,29 +14,28 @@
 
 class WXDLLIMPEXP_CORE wxStatusBarMac : public wxStatusBarGeneric
 {
-    DECLARE_DYNAMIC_CLASS(wxStatusBarMac)
-
+public:
     wxStatusBarMac();
     wxStatusBarMac(wxWindow *parent, wxWindowID id = wxID_ANY,
-           long style = wxST_DEFAULT_STYLE,
+           long style = wxSTB_DEFAULT_STYLE,
            const wxString& name = wxStatusBarNameStr);
 
     virtual ~wxStatusBarMac();
 
     bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
-              long style = wxST_DEFAULT_STYLE,
+              long style = wxSTB_DEFAULT_STYLE,
               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:
+    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()
 };