added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/mac/statusbr.h b/include/wx/mac/statusbr.h
index c45b2763060d664c1276fb1f10e81ad75aeb8d30..232390ab21c9f6deebbde0ab7f7a10c154a5ba78 100644 (file)
--- a/include/wx/mac/statusbr.h
+++ b/include/wx/mac/statusbr.h
@@ -13,18 +13,16 @@
 #ifndef   _WX_STATBAR_H_
 #define   _WX_STATBAR_H_
 
-#ifdef __GNUG__
-#pragma interface "statbar.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "statbrma.h"
 #endif
 
-#include "wx/generic/statusbr.h"
-
 class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric
 {
   DECLARE_DYNAMIC_CLASS(wxStatusBarMac);
 
-  wxStatusBarMac(void);
-  inline wxStatusBarMac(wxWindow *parent, wxWindowID id,
+  wxStatusBarMac();
+   wxStatusBarMac(wxWindow *parent, wxWindowID id,
            long style = 0,
            const wxString& name = wxPanelNameStr)
   {
@@ -34,15 +32,17 @@ class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric
   ~wxStatusBarMac();
 
   bool Create(wxWindow *parent, wxWindowID id,
-              long style,
+              long style ,
               const wxString& name = wxPanelNameStr) ;
 
   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 MacSuperEnabled( bool enable ) ;
+
   void OnPaint(wxPaintEvent& event);
 protected:
 
@@ -50,4 +50,4 @@ protected:
 };
 
 #endif
-    // _WX_STATBAR_H_
\ No newline at end of file
+    // _WX_STATBAR_H_