2 step creation for wxDocMDIChildFrame (patch 661657)

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 06c17b10b12d366f4bb6b64e22f7ce81fad36a64..b1d31e2fb1406572fc81dd3d646171c7136565fe 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -81,7 +81,6 @@ public:
     virtual void SetFaceName(const wxString& faceName);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
     virtual void SetFaceName(const wxString& faceName);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);

-    virtual void SetNativeFontInfo(const wxNativeFontInfo& info);

 
     virtual bool IsFixedWidth() const;
 
 
     virtual bool IsFixedWidth() const;
 


@@ -90,11 +89,10 @@ public:
 
     virtual bool IsFree() const;
     virtual bool RealizeResource();
 
     virtual bool IsFree() const;
     virtual bool RealizeResource();

-    virtual WXHANDLE GetResourceHandle();
+    virtual WXHANDLE GetResourceHandle() const;

     virtual bool FreeResource(bool force = FALSE);
 
     virtual bool FreeResource(bool force = FALSE);
 

-    // for consistency with other wxMSW classes and to have a const
-    // GetResourceHandle()-like function we have a synonym for it
+    // for consistency with other wxMSW classes

     WXHFONT GetHFONT() const;
 
     /*
     WXHFONT GetHFONT() const;
 
     /*


@@ -103,6 +101,8 @@ public:
      */
 
 protected:
      */
 
 protected:

+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
+

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();