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 c5dcc0dc7d91c57741830d9e26e069696c8ee4f9..011cd8e2c6976368d1987c3e9db09c8daaa0cd15 100644 (file)
--- a/include/wx/mac/statusbr.h
+++ b/include/wx/mac/statusbr.h
@@ -2,53 +2,52 @@
 // 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 wxStatusBarXX : public wxStatusBar
+class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxStatusBarXX);
+  DECLARE_DYNAMIC_CLASS(wxStatusBarMac);

 
 

-public:
-  // ctors
-  wxStatusBarXX();
-  wxStatusBarXX(wxWindow *parent, wxWindowID id = -1, long style = wxST_SIZEGRIP);
+  wxStatusBarMac();
+   wxStatusBarMac(wxWindow *parent, wxWindowID id,
+           long style = 0,
+           const wxString& name = wxPanelNameStr)
+  {
+      Create(parent, id, style, name);
+  }

 
 

-  // create status line
-  bool Create(wxWindow *parent, wxWindowID id = -1, long style = wxST_SIZEGRIP);
+  ~wxStatusBarMac();

 
 

-  // a status line can have several (<256) fields numbered from 0
-  virtual void SetFieldsCount(int number = 1, const int widths[] = NULL);
+  bool Create(wxWindow *parent, wxWindowID id,
+              long style ,
+              const wxString& name = wxPanelNameStr) ;

 
 

-  // each field of status line has its own text
-  virtual void     SetStatusText(const wxString& text, int number = 0);
-  virtual wxString GetStatusText(int number = 0) const;
+  virtual void DrawFieldText(wxDC& dc, int i);
+  virtual void DrawField(wxDC& dc, int i);
+  virtual void SetStatusText(const wxString& text, int number = 0) ;
+  ////////////////////////////////////////////////////////////////////////
+  // Implementation

 
 

-  // set status line fields' widths
-  virtual void SetStatusWidths(int n, const int widths_field[]);
+  virtual void MacSuperEnabled( bool enable ) ;

 
 

-  void OnSize(wxSizeEvent& event);
+  void OnPaint(wxPaintEvent& event);
+protected:

 
   DECLARE_EVENT_TABLE()
 
   DECLARE_EVENT_TABLE()

-
-protected:
-  void CopyFieldsWidth(const int widths[]);
-  void SetFieldsWidth();

 };
 
 #endif
 };
 
 #endif

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