Hartwig's patch for OS X implementation of wxDataViewCtrl

[wxWidgets.git] / include / wx / mac / carbon / statusbr.h

diff --git a/include/wx/mac/carbon/statusbr.h b/include/wx/mac/carbon/statusbr.h
index 4c2c1b191d34bb9fd51fc34271ef405e8c09837d..1ff5901db22890334ad1989a526215b302ddf963 100644 (file)
--- a/include/wx/mac/carbon/statusbr.h
+++ b/include/wx/mac/carbon/statusbr.h
@@ -1,7 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        statusbr.h
-// Purpose:     native implementation of wxStatusBar. Optional; can use generic
-//              version instead.
+// Name:        wx/mac/carbon/statusbr.h
+// Purpose:     native implementation of wxStatusBar.
+//              Optional: can use generic version instead.
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
@@ -10,44 +10,34 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef   _WX_STATBAR_H_
-#define   _WX_STATBAR_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "statbrma.h"
-#endif
+#ifndef _WX_STATBAR_H_
+#define _WX_STATBAR_H_
 
 class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric
 {
-  DECLARE_DYNAMIC_CLASS(wxStatusBarMac)
+    DECLARE_DYNAMIC_CLASS(wxStatusBarMac)
 
-  wxStatusBarMac();
-   wxStatusBarMac(wxWindow *parent, wxWindowID id,
-           long style = 0,
-           const wxString& name = wxPanelNameStr)
-  {
-      Create(parent, id, style, name);
-  }
+    wxStatusBarMac();
+    wxStatusBarMac(wxWindow *parent, wxWindowID id = wxID_ANY,
+           long style = wxST_SIZEGRIP,
+           const wxString& name = wxStatusBarNameStr);
 
-  ~wxStatusBarMac();
+    virtual ~wxStatusBarMac();
 
-  bool Create(wxWindow *parent, wxWindowID id,
-              long style ,
-              const wxString& name = wxPanelNameStr) ;
+    bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
+              long style = wxST_SIZEGRIP,
+              const wxString& name = wxStatusBarNameStr);
 
-  virtual void DrawFieldText(wxDC& dc, int i);
-  virtual void DrawField(wxDC& dc, int i);
-  virtual void SetStatusText(const wxString& text, int number = 0) ;
-  ////////////////////////////////////////////////////////////////////////
-  // Implementation
+    virtual void DrawFieldText(wxDC& dc, int i);
+    virtual void DrawField(wxDC& dc, int i);
+    virtual void SetStatusText(const wxString& text, int number = 0);
 
-  virtual void        MacHiliteChanged() ;
+    // Implementation
+    virtual void MacHiliteChanged();
+    void OnPaint(wxPaintEvent& event);
 
-  void OnPaint(wxPaintEvent& event);
 protected:
-
-  DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
-#endif
-    // _WX_STATBAR_H_
+#endif // _WX_STATBAR_H_