Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index f2ab5e5f7408cf9de9df074ffe4fb17a8dfe6383..781b5878ab406c7250d863a379a409242eb87be4 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -18,8 +18,6 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
-
 class WXDLLEXPORT wxStaticText : public wxControl
 {
 DECLARE_DYNAMIC_CLASS(wxStaticText)
@@ -27,32 +25,33 @@ DECLARE_DYNAMIC_CLASS(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);
     }
 
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticTextNameStr);
+    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 SetFont( const wxFont &font );
 
     // 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);
 
 protected: