compilation fixes - wxGTK compiles but not links

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

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index 10e1d82f7e0f7444656deefc3c817f5e46d82054..003dd85a7ecea8dbda8691e4a1714727b16b48a2 100644 (file)
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -50,12 +50,18 @@
 // ----------------------------------------------------------------------------
 
 // convert to/from the string representation: format is
 // ----------------------------------------------------------------------------
 
 // convert to/from the string representation: format is

-//      facename[;charset]
+//      encodingid;facename[;charset]

 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
     wxStringTokenizer tokenizer(s, _T(";"));
 
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
     wxStringTokenizer tokenizer(s, _T(";"));
 

+    wxString encid = tokenizer.GetNextToken();
+    long enc;
+    if ( !encid.ToLong(&enc) )
+        return FALSE;
+    encoding = (wxFontEncoding)enc;
+

     facename = tokenizer.GetNextToken();
     if ( !facename )
         return FALSE;
     facename = tokenizer.GetNextToken();
     if ( !facename )
         return FALSE;


@@ -81,10 +87,12 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
 
 wxString wxNativeEncodingInfo::ToString() const
 {
 
 wxString wxNativeEncodingInfo::ToString() const
 {

-    wxString s(facename);
+    wxString s;
+
+    s << (long)encoding << _T(';') << facename;

     if ( charset != ANSI_CHARSET )
     {
     if ( charset != ANSI_CHARSET )
     {

-        s << _T(';') << charset;
+         s << _T(';') << charset;

     }
 
     return s;
     }
 
     return s;


@@ -143,6 +151,10 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
         case wxFONTENCODING_CP1257:
             info->charset = BALTIC_CHARSET;
             break;
         case wxFONTENCODING_CP1257:
             info->charset = BALTIC_CHARSET;
             break;

+
+        case wxFONTENCODING_CP874:
+            info->charset = THAI_CHARSET;
+            break;

 #endif // !Win16
 
         case wxFONTENCODING_CP437:
 #endif // !Win16
 
         case wxFONTENCODING_CP437:


@@ -154,6 +166,8 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             return FALSE;
     }
 
             return FALSE;
     }
 

+    info->encoding = encoding;
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -164,7 +178,7 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
     wxZeroMemory(lf);       // all default values
 
     lf.lfCharSet = info.charset;
     wxZeroMemory(lf);       // all default values
 
     lf.lfCharSet = info.charset;

-    strncpy(lf.lfFaceName, info.facename, sizeof(lf.lfFaceName));
+    wxStrncpy(lf.lfFaceName, info.facename, sizeof(lf.lfFaceName));

 
     HFONT hfont = ::CreateFontIndirect(&lf);
     if ( !hfont )
 
     HFONT hfont = ::CreateFontIndirect(&lf);
     if ( !hfont )


@@ -178,6 +192,69 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
     return TRUE;
 }
 
     return TRUE;
 }
 

+// ----------------------------------------------------------------------------
+// wxFontEncoding <-> CHARSET_XXX
+// ----------------------------------------------------------------------------
+
+wxFontEncoding wxGetFontEncFromCharSet(int cs)
+{
+    wxFontEncoding fontEncoding;
+
+    switch ( cs )
+    {
+        default:
+            // JACS: Silently using ANSI_CHARSET
+            // apparently works for Chinese Windows. Assume it works
+            // for all/most other languages.
+            //wxFAIL_MSG(wxT("unsupported charset"));
+            // fall through
+
+        case ANSI_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1252;
+            break;
+
+#ifdef __WIN32__
+        case EASTEUROPE_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1250;
+            break;
+
+        case BALTIC_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1257;
+            break;
+
+        case RUSSIAN_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1251;
+            break;
+
+        case ARABIC_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1256;
+            break;
+
+        case GREEK_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1253;
+            break;
+
+        case HEBREW_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1255;
+            break;
+
+        case TURKISH_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1254;
+            break;
+
+        case THAI_CHARSET:
+            fontEncoding = wxFONTENCODING_CP437;
+            break;
+#endif // Win32
+
+        case OEM_CHARSET:
+            fontEncoding = wxFONTENCODING_CP437;
+            break;
+    }
+
+    return fontEncoding;
+}
+

 // ----------------------------------------------------------------------------
 // wxFont <-> LOGFONT conversion
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFont <-> LOGFONT conversion
 // ----------------------------------------------------------------------------


@@ -256,23 +333,28 @@ void wxFillLogFont(LOGFONT *logFont, const wxFont *font)
             break;
     }
 
             break;
     }
 

-#if 0
-    HDC dc = ::GetDC(NULL);
-    int ppInch = ::GetDeviceCaps(dc, LOGPIXELSY);
-    ::ReleaseDC(NULL, dc);
-#else
+    // VZ: I'm reverting this as we clearly must use the real screen
+    //     resolution instead of hardcoded one or it surely will fail to work
+    //     in some cases.
+    //
+    //     If there are any problems with this code, please let me know about
+    //     it instead of reverting this change, thanks!
+#if 1 // wxUSE_SCREEN_DPI
+    const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
+#else // 0

     // New behaviour: apparently ppInch varies according to Large/Small Fonts
     // setting in Windows. This messes up fonts. So, set ppInch to a constant
     // 96 dpi.
     static const int ppInch = 96;
     // New behaviour: apparently ppInch varies according to Large/Small Fonts
     // setting in Windows. This messes up fonts. So, set ppInch to a constant
     // 96 dpi.
     static const int ppInch = 96;

-#endif // 0/1
+#endif // 1/0

 
 

+    int pointSize = font->GetPointSize();

 #if wxFONT_SIZE_COMPATIBILITY
     // Incorrect, but compatible with old wxWindows behaviour
 #if wxFONT_SIZE_COMPATIBILITY
     // Incorrect, but compatible with old wxWindows behaviour

-    int nHeight = (font->GetPointSize()*ppInch/72);
+    int nHeight = (pointSize*ppInch)/72;

 #else
     // Correct for Windows compatibility
 #else
     // Correct for Windows compatibility

-    int nHeight = - (font->GetPointSize()*ppInch/72);
+    int nHeight = -(int)((pointSize*((double)ppInch)/72.0) + 0.5);

 #endif
 
     wxString facename = font->GetFaceName();
 #endif
 
     wxString facename = font->GetFaceName();


@@ -287,7 +369,9 @@ void wxFillLogFont(LOGFONT *logFont, const wxFont *font)
     wxFontEncoding encoding = font->GetEncoding();
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
     wxFontEncoding encoding = font->GetEncoding();
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {

+#if wxUSE_FONTMAP

         if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
         if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )

+#endif // wxUSE_FONTMAP

         {
             // unsupported encoding, replace with the default
             info.charset = ANSI_CHARSET;
         {
             // unsupported encoding, replace with the default
             info.charset = ANSI_CHARSET;


@@ -319,120 +403,10 @@ void wxFillLogFont(LOGFONT *logFont, const wxFont *font)
 
 wxFont wxCreateFontFromLogFont(const LOGFONT *logFont)
 {
 
 wxFont wxCreateFontFromLogFont(const LOGFONT *logFont)
 {

-    // extract family from pitch-and-family
-    int lfFamily = logFont->lfPitchAndFamily;
-    if ( lfFamily & FIXED_PITCH )
-        lfFamily -= FIXED_PITCH;
-    if ( lfFamily & VARIABLE_PITCH )
-        lfFamily -= VARIABLE_PITCH;
-
-    int fontFamily;
-    switch ( lfFamily )
-    {
-        case FF_ROMAN:
-            fontFamily = wxROMAN;
-            break;
+    wxNativeFontInfo info;

 
 

-        case FF_SWISS:
-            fontFamily = wxSWISS;
-            break;
-
-        case FF_SCRIPT:
-            fontFamily = wxSCRIPT;
-            break;
+    info.lf = *logFont;

 
 

-        case FF_MODERN:
-            fontFamily = wxMODERN;
-            break;
-
-        case FF_DECORATIVE:
-            fontFamily = wxDECORATIVE;
-            break;
-
-        default:
-            fontFamily = wxSWISS;
-    }
-
-    // weight and style
-    int fontWeight = wxNORMAL;
-    switch ( logFont->lfWeight )
-    {
-        case FW_LIGHT:
-            fontWeight = wxLIGHT;
-            break;
-
-        default:
-        case FW_NORMAL:
-            fontWeight = wxNORMAL;
-            break;
-
-        case FW_BOLD:
-            fontWeight = wxBOLD;
-            break;
-    }
-
-    int fontStyle = logFont->lfItalic ? wxITALIC : wxNORMAL;
-
-    bool fontUnderline = logFont->lfUnderline != 0;
-
-    wxString fontFace = logFont->lfFaceName;
-
-    // font size
-    HDC dc = ::GetDC(NULL);
-
-    // remember that 1pt = 1/72inch
-    int height = abs(logFont->lfHeight);
-    int fontPoints = (72*height)/GetDeviceCaps(dc, LOGPIXELSY);
-
-    ::ReleaseDC(NULL, dc);
-
-    wxFontEncoding fontEncoding;
-    switch ( logFont->lfCharSet )
-    {
-        default:
-            wxFAIL_MSG(wxT("unsupported charset"));
-            // fall through
-
-        case ANSI_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1252;
-            break;
-
-        case EASTEUROPE_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1250;
-            break;
-
-        case BALTIC_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1257;
-            break;
-
-        case RUSSIAN_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1251;
-            break;
-
-        case ARABIC_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1256;
-            break;
-
-        case GREEK_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1253;
-            break;
-
-        case HEBREW_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1255;
-            break;
-
-        case TURKISH_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1254;
-            break;
-
-        case OEM_CHARSET:
-            fontEncoding = wxFONTENCODING_CP437;
-            break;
-    }
-
-    return wxFont(fontPoints, fontFamily, fontStyle,
-                  fontWeight, fontUnderline, fontFace,
-                  fontEncoding);
+    return wxFont(info);

 }
 
 }
 

-