Initial work on virtual file system support for the WebKitGTK+ backend. It now suppor...

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

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index 1ad12b5e390e06a0c199f99e97989af29bfa0970..7ee5cac3ffbdf462ba0776aaf5e286f56492dac0 100644 (file)
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -12,7 +12,9 @@
 #ifndef _WX_UNIV_STATTEXT_H_
 #define _WX_UNIV_STATTEXT_H_
 
 #ifndef _WX_UNIV_STATTEXT_H_
 #define _WX_UNIV_STATTEXT_H_
 

-class WXDLLEXPORT wxStaticText : public wxStaticTextBase
+#include "wx/generic/stattextg.h"
+
+class WXDLLIMPEXP_CORE wxStaticText : public wxGenericStaticText

 {
 public:
     wxStaticText() { }
 {
 public:
     wxStaticText() { }


@@ -54,13 +56,13 @@ public:
     virtual bool IsFocused() const { return false; }
 
 protected:
     virtual bool IsFocused() const { return false; }
 
 protected:

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

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

-    DECLARE_ABSTRACT_CLASS(wxStaticText)
+    virtual void DoSetLabel(const wxString& str);
+    virtual wxString DoGetLabel() const;
+
+    DECLARE_DYNAMIC_CLASS(wxStaticText)

 };
 
 #endif // _WX_UNIV_STATTEXT_H_
 };
 
 #endif // _WX_UNIV_STATTEXT_H_