removing outdated code

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 20c49b73a4f1e1e6db79adcb1d1db9bb78e6fa1b..2bae45488975063e193e4d749c9e81df723252f6 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        stattext.h
+// Name:        wx/msw/stattext.h

 // Purpose:     wxStaticText class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxStaticText class
 // Author:      Julian Smart
 // Modified by:


@@ -12,11 +12,7 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

-#ifdef __GNUG__
-    #pragma interface "stattext.h"
-#endif
-
-class WXDLLEXPORT wxStaticText : public wxStaticTextBase
+class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase

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


@@ -44,12 +40,18 @@ public:
     virtual void SetLabel(const wxString& label);
     virtual bool SetFont( const wxFont &font );
 
     virtual void SetLabel(const wxString& label);
     virtual bool SetFont( const wxFont &font );
 

+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+

 protected:
 protected:

+    // implement/override some base class virtuals

     virtual void DoSetSize(int x, int y, int w, int h,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y, int w, int h,
                            int sizeFlags = wxSIZE_AUTO);

-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestClientSize() const;
+
+    virtual wxString DoGetLabel() const;
+    virtual void DoSetLabel(const wxString& str);

 
 

-    DECLARE_DYNAMIC_CLASS(wxStaticText)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)

 };
 
 #endif
 };
 
 #endif