Define wx[U]IntPtr as long, not [s]size_t, in 32 bit builds.

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

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index 888ade81f60d9e61e3b20f546832302897f327a2..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_
 
-class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
+#include "wx/generic/stattextg.h"
+
+class WXDLLIMPEXP_CORE wxStaticText : public wxGenericStaticText
 {
 public:
     wxStaticText() { }
@@ -54,16 +56,13 @@ public:
     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);
 
     virtual void DoSetLabel(const wxString& str);
     virtual wxString DoGetLabel() const;
 
-    DECLARE_ABSTRACT_CLASS(wxStaticText)
+    DECLARE_DYNAMIC_CLASS(wxStaticText)
 };
 
 #endif // _WX_UNIV_STATTEXT_H_