Headers moved a bit.

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 106d32a3efa468fcfb5f09e0290933eebd56194c..93f757164f3b7b271381f13c2700ff34280f60bf 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -41,7 +41,13 @@
 #endif
 
 #ifdef __WXMOTIF__
 #endif
 
 #ifdef __WXMOTIF__

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 #endif
 
 #if !USE_SHARED_LIBRARY
 #endif
 
 #if !USE_SHARED_LIBRARY


@@ -585,7 +591,7 @@ void wxFontList::RemoveFont (wxFont * font)
 }
 
 wxFont *wxFontList::
 }
 
 wxFont *wxFontList::

-        FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face)
+        FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face, wxFontEncoding encoding)

 {
   for (wxNode * node = First (); node; node = node->Next ())
     {
 {
   for (wxNode * node = First (); node; node = node->Next ())
     {


@@ -604,11 +610,12 @@ wxFont *wxFontList::
 #else
           each_font->GetFamily() == FamilyOrFontId &&
 #endif
 #else
           each_font->GetFamily() == FamilyOrFontId &&
 #endif

-          ((each_font->GetFaceName() == wxT("")) || each_font->GetFaceName() == Face))
+          ((each_font->GetFaceName() == wxT("")) || each_font->GetFaceName() == Face) &&
+          (encoding == wxFONTENCODING_DEFAULT || each_font->GetEncoding() == encoding))

         //#endif
         return each_font;
     }
         //#endif
         return each_font;
     }

-  wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face);
+  wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face, encoding);

   font->SetVisible(TRUE);
   return font;
 }
   font->SetVisible(TRUE);
   return font;
 }