Attempt to make wxWindows play better with XP themes

[wxWidgets.git] / src / msw / font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index c1d032c4760d29dbee3ac4eb88c86348a81bb8c2..f29b9a4aeafd5c067b639d2fd72ea24befa78e89 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -432,6 +432,7 @@ void wxNativeFontInfo::SetStyle(wxFontStyle style)
             // fall through
 
         case wxFONTSTYLE_NORMAL:
             // fall through
 
         case wxFONTSTYLE_NORMAL:

+            lf.lfItalic = FALSE;

             break;
 
         case wxFONTSTYLE_ITALIC:
             break;
 
         case wxFONTSTYLE_ITALIC:


@@ -741,9 +742,9 @@ bool wxFont::FreeResource(bool WXUNUSED(force))
     return FALSE;
 }
 
     return FALSE;
 }
 

-WXHANDLE wxFont::GetResourceHandle()
+WXHANDLE wxFont::GetResourceHandle() const

 {
 {

-    return GetHFONT();
+    return (WXHANDLE)GetHFONT();

 }
 
 WXHFONT wxFont::GetHFONT() const
 }
 
 WXHFONT wxFont::GetHFONT() const


@@ -838,7 +839,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)

 {
     Unshare();
 
 {
     Unshare();