Add wxABI_VERSION wrappers

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index f2ab5e5f7408cf9de9df074ffe4fb17a8dfe6383..619418760682e8b90890561e0f7a5ae87886a10e 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,51 +12,48 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "stattext.h"
 #endif
 
     #pragma interface "stattext.h"
 #endif
 

-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
-
-class WXDLLEXPORT wxStaticText : public wxControl
+class WXDLLEXPORT wxStaticText : public wxStaticTextBase

 {
 {

-DECLARE_DYNAMIC_CLASS(wxStaticText)
-

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

-    wxStaticText(wxWindow *parent, wxWindowID id,
-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticTextNameStr)
+    wxStaticText(wxWindow *parent,
+                 wxWindowID id,
+                 const wxString& label,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = 0,
+                 const wxString& name = wxStaticTextNameStr)

     {
         Create(parent, id, label, pos, size, style, name);
     }
 
     {
         Create(parent, id, label, pos, size, style, name);
     }
 

-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticTextNameStr);
-
-    // accessors
-    void SetLabel(const wxString& label);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxStaticTextNameStr);

 
 

-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
-
-    // callbacks
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    // override some methods to resize the window properly
+    virtual void SetLabel(const wxString& label);
+    virtual bool SetFont( const wxFont &font );

 
 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;

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

 };
 
 #endif
 };
 
 #endif