Include wx/msw/wrap*.h according to pch support (with other minor cleaning).

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 781b5878ab406c7250d863a379a409242eb87be4..284067079dfcf02c7386232173bc7ce60603c357 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,16 +12,8 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

-#ifdef __GNUG__
-    #pragma interface "stattext.h"
-#endif
-
-#include "wx/control.h"
-
-class WXDLLEXPORT wxStaticText : public wxControl
+class WXDLLEXPORT wxStaticText : public wxStaticTextBase

 {
 {

-DECLARE_DYNAMIC_CLASS(wxStaticText)
-

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


@@ -44,18 +36,20 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticTextNameStr);
 
                 long style = 0,
                 const wxString& name = wxStaticTextNameStr);
 

-    // accessors
-    void SetLabel(const wxString& label);
-    bool SetFont( const wxFont &font );
-
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    // override some methods to resize the window properly
+    virtual void SetLabel(const wxString& label);
+    virtual bool SetFont( const wxFont &font );

 
 

-    // callbacks
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;

 
 protected:
 
 protected:

+    // implement/override some base class virtuals
+    virtual wxBorder GetDefaultBorder() const;
+    virtual void DoSetSize(int x, int y, int w, int h,
+                           int sizeFlags = wxSIZE_AUTO);

     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetBestSize() const;

+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)

 };
 
 #endif
 };
 
 #endif