From: Francesco Montorsi <f18m_cpp217828@yahoo.it>
Date: Mon, 3 Nov 2008 18:24:05 +0000 (+0000)
Subject: build fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9817be8a86c3818597a3f7cda014794f57ee8886

build fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index ba22cb5cdb..a88eee2606 100644
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -155,9 +155,9 @@ protected:
     bool DoCreate(int size,
                   const wxSize& pixelSize,
                   bool sizeUsingPixels,
-                  int family,
-                  int style,
-                  int weight,
+                  wxFontFamily family,
+                  wxFontStyle style,
+                  wxFontWeight weight,
                   bool underlined = false,
                   const wxString& face = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 778f351b9c..911cfd84b5 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -171,18 +171,18 @@ public:
         return m_nativeFontInfoOk ? true : m_sizeUsingPixels;
     }
 
-    int GetFamily() const
+    wxFontFamily GetFamily() const
     {
         return m_family;
     }
 
-    int GetStyle() const
+    wxFontStyle GetStyle() const
     {
         return m_nativeFontInfoOk ? m_nativeFontInfo.GetStyle()
                                   : m_style;
     }
 
-    int GetWeight() const
+    wxFontWeight GetWeight() const
     {
         return m_nativeFontInfoOk ? m_nativeFontInfo.GetWeight()
                                   : m_weight;
@@ -410,7 +410,7 @@ void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
     m_nativeFontInfo = info;
     // This is the best we can do since we don't have the
     // correct information at this point.
-    m_family = wxSWISS;
+    m_family = wxFONTFAMILY_SWISS;
 }
 
 wxFontRefData::~wxFontRefData()