Don't interpret '&' specially in wxTextWrapper.

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

diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h
index 8d04cca4f6fd5d1a68a9e4311352c070660258ce..f2b70c477fb746fef616b86c61b9e2d117109322 100644 (file)
--- a/include/wx/osx/statusbr.h
+++ b/include/wx/osx/statusbr.h
@@ -1,5 +1,43 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/statusbr.h"
-#else
-#include "wx/osx/carbon/statusbr.h"
-#endif
+///////////////////////////////////////////////////////////////////////////////
+// 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
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_STATBAR_H_
+#define _WX_STATBAR_H_
+
+class WXDLLIMPEXP_CORE wxStatusBarMac : public wxStatusBarGeneric
+{
+public:
+    wxStatusBarMac();
+    wxStatusBarMac(wxWindow *parent, wxWindowID id = wxID_ANY,
+           long style = wxSTB_DEFAULT_STYLE,
+           const wxString& name = wxStatusBarNameStr);
+
+    virtual ~wxStatusBarMac();
+
+    bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
+              long style = wxSTB_DEFAULT_STYLE,
+              const wxString& name = wxStatusBarNameStr);
+
+    // 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()
+};
+
+#endif // _WX_STATBAR_H_