Fix some compilation and linking errors in samples.

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

diff --git a/include/wx/mac/statusbr.h b/include/wx/mac/statusbr.h
index c45b2763060d664c1276fb1f10e81ad75aeb8d30..011cd8e2c6976368d1987c3e9db09c8daaa0cd15 100644 (file)
--- a/include/wx/mac/statusbr.h
+++ b/include/wx/mac/statusbr.h
@@ -2,29 +2,27 @@
 // Name:        statusbr.h
 // Purpose:     native implementation of wxStatusBar. Optional; can use generic
 //              version instead.
 // Name:        statusbr.h
 // Purpose:     native implementation of wxStatusBar. Optional; can use generic
 //              version instead.

-// Author:      AUTHOR
-// Modified by: 
-// Created:     ??/??/98
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_STATBAR_H_
 #define   _WX_STATBAR_H_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_STATBAR_H_
 #define   _WX_STATBAR_H_
 

-#ifdef __GNUG__
-#pragma interface "statbar.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "statbrma.h"

 #endif
 
 #endif
 

-#include "wx/generic/statusbr.h"
-

 class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric
 {
   DECLARE_DYNAMIC_CLASS(wxStatusBarMac);
 
 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)
   {
            long style = 0,
            const wxString& name = wxPanelNameStr)
   {


@@ -34,15 +32,17 @@ class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric
   ~wxStatusBarMac();
 
   bool Create(wxWindow *parent, wxWindowID id,
   ~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);
               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
 
   ////////////////////////////////////////////////////////////////////////
   // Implementation
 

+  virtual void MacSuperEnabled( bool enable ) ;
+

   void OnPaint(wxPaintEvent& event);
 protected:
 
   void OnPaint(wxPaintEvent& event);
 protected:
 


@@ -50,4 +50,4 @@ protected:
 };
 
 #endif
 };
 
 #endif

-    // _WX_STATBAR_H_
\ No newline at end of file
+    // _WX_STATBAR_H_