don't do anything in SetWindowMenu() if we're setting the same menu as we already...

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

diff --git a/include/wx/osx/stattext.h b/include/wx/osx/stattext.h
index 9588f2483255b272e38441b8bfab1d1800377e42..fc69ab3457c57a5e43eaa57ce8f7bb95caa5ede2 100644 (file)
--- a/include/wx/osx/stattext.h
+++ b/include/wx/osx/stattext.h
@@ -1,5 +1,54 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/stattext.h"
-#else
-#include "wx/osx/carbon/stattext.h"
+/////////////////////////////////////////////////////////////////////////////
+// Name:        stattext.h
+// Purpose:     wxStaticText class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_STATTEXT_H_
+#define _WX_STATTEXT_H_
+
+class WXDLLIMPEXP_CORE wxStaticText: public wxStaticTextBase
+{
+public:
+    wxStaticText() { }
+
+    wxStaticText(wxWindow *parent, wxWindowID id,
+           const wxString& label,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           long style = 0,
+           const wxString& name = wxStaticTextNameStr)
+  {
+    Create(parent, id, label, pos, size, style, name);
+  }
+
+  bool Create(wxWindow *parent, wxWindowID id,
+           const wxString& label,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           long style = 0,
+           const wxString& name = wxStaticTextNameStr);
+
+  // accessors
+  void SetLabel( const wxString &str ) ;
+  bool SetFont( const wxFont &font );
+
+    virtual bool AcceptsFocus() const { return FALSE; }
+
+protected :
+
+    virtual wxString DoGetLabel() const;
+    virtual void DoSetLabel(const wxString& str);
+
+  virtual wxSize DoGetBestSize() const ;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
+};
+
 #endif
+    // _WX_STATTEXT_H_