carbon cfm fixes

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

diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h
index 809568191e500544135a654d35497a202eab0b2a..6686c96982fd80da969685882386aaf5925a2a6f 100644 (file)
--- a/include/wx/gtk/stattext.h
+++ b/include/wx/gtk/stattext.h
@@ -11,7 +11,7 @@
 #ifndef __GTKSTATICTEXTH__
 #define __GTKSTATICTEXTH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -30,8 +30,6 @@ class wxStaticText;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const wxChar *wxStaticTextNameStr;
-
 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
@@ -39,7 +37,6 @@ extern const wxChar *wxStaticTextNameStr;
 class wxStaticText : public wxControl
 {
 public:
-
     wxStaticText();
     wxStaticText(wxWindow *parent,
                  wxWindowID id,
@@ -60,10 +57,18 @@ public:
     wxString GetLabel() const;
     void SetLabel( const wxString &label );
 
+    bool SetFont( const wxFont &font );
+    bool SetForegroundColour( const wxColour& colour );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    
     // implementation
-    void ApplyWidgetStyle();
+    // --------------
 
 protected:
+    virtual wxSize DoGetBestSize() const;
+
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };