Removed /install/gtk/configure from cvs

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 727048a9b8b324290c7e3c2af1dcb8dc88fa8809..66a9fdbb79547daa0bdf991fa96b2d293ad2bd0b 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -146,7 +146,7 @@ bool wxFont::RealizeResource(void)
     else if (M_FONTDATA->m_weight == wxBOLD)
       ff_weight = FW_BOLD;
 
     else if (M_FONTDATA->m_weight == wxBOLD)
       ff_weight = FW_BOLD;
 

-#if defined(__X__) || (defined(__WINDOWS__) && USE_PORTABLE_FONTS_IN_MSW)
+#if defined(__X__) || (defined(__WXMSW__) && USE_PORTABLE_FONTS_IN_MSW)

     ff_face = wxTheFontNameDirectory.GetScreenName(M_FONTDATA->m_family, M_FONTDATA->m_weight, M_FONTDATA->m_style);
 #else
     ff_face = M_FONTDATA->m_faceName;
     ff_face = wxTheFontNameDirectory.GetScreenName(M_FONTDATA->m_family, M_FONTDATA->m_weight, M_FONTDATA->m_style);
 #else
     ff_face = M_FONTDATA->m_faceName;


@@ -197,7 +197,7 @@ bool wxFont::RealizeResource(void)
     M_FONTDATA->m_hFont = (WXHFONT) CreateFont(nHeight, 0, 0, 0,ff_weight,ff_italic,(BYTE)ff_underline,
                 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
                 PROOF_QUALITY, DEFAULT_PITCH | ff_family, (ff_face == "" ? NULL : (const char *)ff_face));
     M_FONTDATA->m_hFont = (WXHFONT) CreateFont(nHeight, 0, 0, 0,ff_weight,ff_italic,(BYTE)ff_underline,
                 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
                 PROOF_QUALITY, DEFAULT_PITCH | ff_family, (ff_face == "" ? NULL : (const char *)ff_face));

-#ifdef DEBUG_CREATE
+#ifdef WXDEBUG_CREATE

     if (m_hFont==NULL) wxError("Cannot create font","Internal Error") ;
 #endif
     return (M_FONTDATA->m_hFont != (WXHFONT) NULL);
     if (m_hFont==NULL) wxError("Cannot create font","Internal Error") ;
 #endif
     return (M_FONTDATA->m_hFont != (WXHFONT) NULL);


@@ -243,28 +243,28 @@ bool wxFont::IsFree(void)
   return (M_FONTDATA && (M_FONTDATA->m_hFont == 0));
 }
 
   return (M_FONTDATA && (M_FONTDATA->m_hFont == 0));
 }
 

-void wxFont::SetPointSize(const int pointSize)
+void wxFont::SetPointSize(int pointSize)

 {
     if ( !m_refData )
         m_refData = new wxFontRefData;
     M_FONTDATA->m_pointSize = pointSize;
 }
 
 {
     if ( !m_refData )
         m_refData = new wxFontRefData;
     M_FONTDATA->m_pointSize = pointSize;
 }
 

-void wxFont::SetFamily(const int family)
+void wxFont::SetFamily(int family)

 {
     if ( !m_refData )
         m_refData = new wxFontRefData;
     M_FONTDATA->m_family = family;
 }
 
 {
     if ( !m_refData )
         m_refData = new wxFontRefData;
     M_FONTDATA->m_family = family;
 }
 

-void wxFont::SetStyle(const int style)
+void wxFont::SetStyle(int style)

 {
     if ( !m_refData )
         m_refData = new wxFontRefData;
     M_FONTDATA->m_style = style;
 }
 
 {
     if ( !m_refData )
         m_refData = new wxFontRefData;
     M_FONTDATA->m_style = style;
 }
 

-void wxFont::SetWeight(const int weight)
+void wxFont::SetWeight(int weight)

 {
     if ( !m_refData )
         m_refData = new wxFontRefData;
 {
     if ( !m_refData )
         m_refData = new wxFontRefData;


@@ -278,7 +278,7 @@ void wxFont::SetFaceName(const wxString& faceName)
     M_FONTDATA->m_faceName = faceName;
 }
 
     M_FONTDATA->m_faceName = faceName;
 }
 

-void wxFont::SetUnderlined(const bool underlined)
+void wxFont::SetUnderlined(bool underlined)

 {
     if ( !m_refData )
         m_refData = new wxFontRefData;
 {
     if ( !m_refData )
         m_refData = new wxFontRefData;