fixed a design flaw in wxFontMapper that prevented automatic creation of wxConfig...

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 090e96eec1fdebece4fe5d5993564f395336baa2..781b5878ab406c7250d863a379a409242eb87be4 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATTEXT_H_
@@ -18,47 +18,44 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
-
 class WXDLLEXPORT wxStaticText : public wxControl
 {
 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:
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+    virtual wxSize DoGetBestSize() const;
 };
 
 #endif