allow specifying the style for wxHtmlHelpController used as fallback by wxBestHelpCon...

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 249fcf549ae46c9ec5be5444fdf8de5ec2816399..c94d02a71c67c79cc68e4896309ec996ac1a0fc4 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        font.h
+// Name:        wx/msw/font.h
 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
@@ -12,7 +12,7 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
-#include <wx/gdicmn.h>
+#include "wx/gdicmn.h"
 
 // ----------------------------------------------------------------------------
 // wxFont
@@ -22,8 +22,7 @@ class WXDLLEXPORT wxFont : public wxFontBase
 {
 public:
     // ctors and such
-    wxFont() { Init(); }
-    wxFont(const wxFont& font) : wxFontBase(font) { Init(); Ref(font); }
+    wxFont() { }
 
     wxFont(int size,
            int family,
@@ -33,8 +32,6 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
-        Init();
-
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
@@ -46,16 +43,12 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
-        Init();
-
         (void)Create(pixelSize, family, style, weight,
                      underlined, face, encoding);
     }
 
     wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
     {
-        Init();
-
         Create(info, hFont);
     }
 
@@ -89,9 +82,6 @@ public:
 
     virtual ~wxFont();
 
-    // assignment
-    wxFont& operator=(const wxFont& font);
-
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual wxSize GetPixelSize() const;
@@ -145,14 +135,10 @@ protected:
 
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
 
-    // common part of all ctors
-    void Init();
-
     void Unshare();
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
-#endif
-    // _WX_FONT_H_
+#endif // _WX_FONT_H_