added wxGetMultiChoice() (which refuses to work for some reason - will fix

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

diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp
index d36dbb08f56e241859fd5f687ca31d17d3b8100b..c5e987133b94e6b8fbab8d66446bf13a84849f23 100644 (file)
--- a/src/os2/fontutil.cpp
+++ b/src/os2/fontutil.cpp
@@ -8,6 +8,10 @@
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
+#define DEBUG_PRINTF(NAME)   { static int raz=0; \
+  printf( #NAME " %i\n",raz); fflush(stdout);       \
+   raz++;                                        \
+ }
 
 // ============================================================================
 // declarations
@@ -17,6 +21,10 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#ifdef __GNUG__
+    #pragma implementation "fontutil.h"
+#endif
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -42,12 +50,18 @@
 // ----------------------------------------------------------------------------
 
 // convert to/from the string representation: format is
-//      facename[;charset]
+//      encodingid;facename[;charset]
 
 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;
@@ -74,7 +88,10 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
 
 wxString wxNativeEncodingInfo::ToString() const
 {
-    wxString s(facename);
+    wxString s;
+
+    s << (long)encoding << _T(';') << facename;
+
 // TODO: what is this for OS/2?
 /*
     if ( charset != ANSI_CHARSET )
@@ -321,6 +338,8 @@ void wxFillLogFont(LOGFONT *logFont, const wxFont *font)
 
 wxFont wxCreateFontFromLogFont(const LOGFONT *logFont)
 {
+DEBUG_PRINTF(wxCreateFontFromLogFont)
+
     // extract family from pitch-and-family
     int lfFamily = logFont->lfPitchAndFamily;
     if ( lfFamily & FIXED_PITCH )