Rebake from clean wx tree.

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

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index 401772e7910d7f7afa26b6bb9e0d4d56610fce0a..8f3fc62edd90bff30c8d9d7921a345402984dd14 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,9 +56,6 @@ 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);