Fixed "different linkage" compile error

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

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index 2de8c76d1050bc6ba5af4fcd78bcc9a420310bd3..810aa35869399ed03bbd130108541a36f564c4f8 100644 (file)
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -13,12 +13,14 @@
 #define _WX_UNIV_STATTEXT_H_
 
 #ifdef __GNUG__
 #define _WX_UNIV_STATTEXT_H_
 
 #ifdef __GNUG__

-    #pragma interface "stattext.h"
+    #pragma interface "univstattext.h"

 #endif
 
 class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
 public:
 #endif
 
 class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
 public:

+    wxStaticText() { }
+

     // usual ctor
     wxStaticText(wxWindow *parent,
                  const wxString& label,
     // usual ctor
     wxStaticText(wxWindow *parent,
                  const wxString& label,


@@ -53,6 +55,8 @@ public:
 
     virtual void SetLabel(const wxString& label);
 
 
     virtual void SetLabel(const wxString& label);
 

+    virtual bool HasTransparentBackground() { return TRUE; }
+    

 protected:
     // calculate the optimal size for the label
     virtual wxSize DoGetBestClientSize() const;
 protected:
     // calculate the optimal size for the label
     virtual wxSize DoGetBestClientSize() const;