added cw6 fixes and patrick's patches

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 78a836caac1ef89916964c6e5cc5cbe1e3939caa..f7c564b1e90ac25632a5f183ef36d6fad8ec29ec 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
@@ -16,10 +16,6 @@
     #pragma interface "font.h"
 #endif
 
-#include "wx/gdiobj.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
-
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
@@ -82,6 +78,11 @@ public:
     virtual bool RealizeResource();
     virtual WXHANDLE GetResourceHandle();
     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
+    WXHFONT GetHFONT() const;
+
     /*
        virtual bool UseResource();
        virtual bool ReleaseResource();