define wxUSE_MFC as 0 if it's not defined (fixes gcc -Wundef warning)

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

diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h
index 9ae390b841876ce96bb2fd3658f4a244d2f627a3..a39b1c3d4ebb2374131b0a90cc27c8221fa74845 100644 (file)
--- a/include/wx/gtk1/stattext.h
+++ b/include/wx/gtk1/stattext.h
@@ -11,7 +11,7 @@
 #ifndef __GTKSTATICTEXTH__
 #define __GTKSTATICTEXTH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -24,7 +24,7 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxStaticText;
+class WXDLLIMPEXP_CORE wxStaticText;
 
 //-----------------------------------------------------------------------------
 // global data
@@ -34,7 +34,7 @@ class wxStaticText;
 // wxStaticText
 //-----------------------------------------------------------------------------
 
-class wxStaticText : public wxControl
+class WXDLLIMPEXP_CORE wxStaticText : public wxControl
 {
 public:
     wxStaticText();
@@ -58,13 +58,19 @@ public:
     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 void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+                           
     virtual wxSize DoGetBestSize() const;
 
     DECLARE_DYNAMIC_CLASS(wxStaticText)