compilation fixes for the compilers with old headers

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

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index f3a7778e52b5282c078597f759e8f9ca04c032e1..f190de22b664af8416feb804b95ac3e6d929c8ef 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -32,17 +32,25 @@
 #endif // PCH
 
 #ifdef __X__
 #endif // PCH
 
 #ifdef __X__

-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#include <X11/Xlib.h>
-#ifdef __VMS__
-#pragma message enable nosimpint
-#endif
+    #ifdef __VMS__
+        #pragma message disable nosimpint
+    #endif
+
+    #include <X11/Xlib.h>
+
+    #ifdef __VMS__
+        #pragma message enable nosimpint
+    #endif

 
     #include "wx/utils.h"       // for wxGetDisplay()
 #elif defined(__WXGTK__)
 
     #include "wx/utils.h"       // for wxGetDisplay()
 #elif defined(__WXGTK__)

-    #include "gdk/gdk.h"
+    // we have to declare struct tm to avoid problems with first forward
+    // declaring it in C code (glib.h included from gdk.h does it) and then
+    // defining it when time.h is included from the headers below - this is
+    // known not to work at least with Sun CC 6.01
+    #include <time.h>
+
+    #include <gdk/gdk.h>

 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"


@@ -184,16 +192,14 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             break;
 
         case wxFONTENCODING_UTF8:
             break;
 
         case wxFONTENCODING_UTF8:

-            // FIXME: this is probably false, but this is how they are called on
-            //        my system and I don't know what the standard XFLD is (VZ)
-            info->xregistry = wxT("iso646.1991");
+            info->xregistry = wxT("iso10646");

             info->xencoding = wxT("*");
             break;
 
         case wxFONTENCODING_KOI8:
             info->xregistry = wxT("koi8");
 
             info->xencoding = wxT("*");
             break;
 
         case wxFONTENCODING_KOI8:
             info->xregistry = wxT("koi8");
 

-            // we don't make distinction between koi8-r and koi8-u (so far)
+            // we don't make distinction between koi8-r, koi8-u and koi8-ru (so far)

             info->xencoding = wxT("*");
             break;
 
             info->xencoding = wxT("*");
             break;
 


@@ -270,7 +276,9 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
         if ( !wxGetNativeFontEncoding(encoding, &info) ||
              !wxTestFontEncoding(info) )
         {
         if ( !wxGetNativeFontEncoding(encoding, &info) ||
              !wxTestFontEncoding(info) )
         {

+#if wxUSE_FONTMAP

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

+#endif // wxUSE_FONTMAP

             {
                 // unspported encoding - replace it with the default
                 //
             {
                 // unspported encoding - replace it with the default
                 //


@@ -310,11 +318,14 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
           *xFontName = newFontName;
     }
 
           *xFontName = newFontName;
     }
 

+    // try to load exactly the font requested first

     if( !font )
     if( !font )

+    {

         font = wxLoadQueryFont( pointSize, family, style, weight,
         font = wxLoadQueryFont( pointSize, family, style, weight,

-                                         underlined, facename,
+                                underlined, facename,

                                 info.xregistry, info.xencoding,
                                 xFontName );
                                 info.xregistry, info.xencoding,
                                 xFontName );

+    }

 
     if ( !font )
     {
 
     if ( !font )
     {


@@ -349,22 +360,49 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
                                    xFontName );
         }
 
                                    xFontName );
         }
 

-        // Bogus font I
+        // ignore size, family, style and weight but try to find font with the
+        // given facename and encoding

         if ( !font )
         {
             font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
                                    underlined, facename,
                                    info.xregistry, info.xencoding,
                                    xFontName);
         if ( !font )
         {
             font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
                                    underlined, facename,
                                    info.xregistry, info.xencoding,
                                    xFontName);

-        }

 
 

-        // Bogus font II
-        if ( !font )
-        {
-            font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
-                                   underlined, wxEmptyString,
-                                   info.xregistry, info.xencoding,
-                                   xFontName);
+            // ignore family as well
+            if ( !font )
+            {
+                font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
+                                       underlined, wxEmptyString,
+                                       info.xregistry, info.xencoding,
+                                       xFontName);
+
+                // if it still failed, try to get the font of any size but
+                // with the requested encoding: this can happen if the
+                // encoding is only available in one size which happens to be
+                // different from 120
+                if ( !font )
+                {
+                    font = wxLoadQueryFont(-1, wxDEFAULT, wxNORMAL, wxNORMAL,
+                                           FALSE, wxEmptyString,
+                                           info.xregistry, info.xencoding,
+                                           xFontName);
+
+                    // this should never happen as we had tested for it in the
+                    // very beginning, but if it does, do return something non
+                    // NULL or we'd crash in wxFont code
+                    if ( !font )
+                    {
+                        wxFAIL_MSG( _T("this encoding should be available!") );
+
+                        font = wxLoadQueryFont(-1,
+                                               wxDEFAULT, wxNORMAL, wxNORMAL,
+                                               FALSE, wxEmptyString,
+                                               _T("*"), _T("*"),
+                                               xFontName);
+                    }
+                }
+            }

         }
     }
 
         }
     }
 


@@ -583,10 +621,21 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
         default:           xweight = wxT("*"); break;
     }
 
         default:           xweight = wxT("*"); break;
     }
 

+    // if pointSize is -1, don't specify any
+    wxString sizeSpec;
+    if ( fontSpec == -1 )
+    {
+        sizeSpec = _T('*');
+    }
+    else
+    {
+        sizeSpec.Printf(_T("%d"), pointSize);
+    }
+

     // construct the X font spec from our data
     // construct the X font spec from our data

-    fontSpec.Printf(wxT("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-%s-%s"),
+    fontSpec.Printf(wxT("-*-%s-%s-%s-normal-*-*-%s-*-*-*-*-%s-%s"),

                     xfamily.c_str(), xweight.c_str(), xstyle.c_str(),
                     xfamily.c_str(), xweight.c_str(), xstyle.c_str(),

-                    pointSize, xregistry.c_str(), xencoding.c_str());
+                    sizeSpec.c_str(), xregistry.c_str(), xencoding.c_str());

 
     if( xFontName )
         *xFontName = fontSpec;
 
     if( xFontName )
         *xFontName = fontSpec;