Revert r62598 which removed "unnecessary wxOSX_USE_COCOA checks."

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

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index e08731b5b18eb84ccc12df1acab0daea23e5d25f..8f3fc62edd90bff30c8d9d7921a345402984dd14 100644 (file)
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -6,26 +6,26 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATTEXT_H_
 #define _WX_UNIV_STATTEXT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATTEXT_H_
 #define _WX_UNIV_STATTEXT_H_
 

-#ifdef __GNUG__
-    #pragma interface "univstattext.h"
-#endif
+#include "wx/generic/stattextg.h"

 
 

-class WXDLLEXPORT wxStaticText : public wxStaticTextBase
+class WXDLLIMPEXP_CORE wxStaticText : public wxGenericStaticText

 {
 public:
 {
 public:

+    wxStaticText() { }
+

     // usual ctor
     wxStaticText(wxWindow *parent,
                  const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize)
     {
     // usual ctor
     wxStaticText(wxWindow *parent,
                  const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize)
     {

-        Create(parent, -1, label, pos, size, 0, wxStaticTextNameStr);
+        Create(parent, wxID_ANY, label, pos, size, 0, wxStaticTextNameStr);

     }
 
     // full form
     }
 
     // full form


@@ -53,13 +53,15 @@ public:
 
     virtual void SetLabel(const wxString& label);
 
 
     virtual void SetLabel(const wxString& label);
 

-protected:
-    // calculate the optimal size for the label
-    virtual wxSize DoGetBestClientSize() const;
+    virtual bool IsFocused() const { return false; }

 
 

+protected:

     // draw the control
     virtual void DoDraw(wxControlRenderer *renderer);
 
     // draw the control
     virtual void DoDraw(wxControlRenderer *renderer);
 

+    virtual void DoSetLabel(const wxString& str);
+    virtual wxString DoGetLabel() const;
+

     DECLARE_ABSTRACT_CLASS(wxStaticText)
 };
 
     DECLARE_ABSTRACT_CLASS(wxStaticText)
 };