Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index fed694a96d433a7217a9f106c897c36d2733d777..715e2c05f6336acba629938db081d732318fb46c 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.09.99
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.09.99

-// RCS-ID:      $Id$

 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -603,12 +602,12 @@ void wxNativeFontInfo::SetFaceName(const wxArrayString& facenames)
 bool wxNativeFontInfo::FromString(const wxString& s)
 {
     long l;
 bool wxNativeFontInfo::FromString(const wxString& s)
 {
     long l;

-    short version;
+    unsigned long version;

 
     wxStringTokenizer tokenizer(s, wxT(";"));
 
     wxString token = tokenizer.GetNextToken();
 
     wxStringTokenizer tokenizer(s, wxT(";"));
 
     wxString token = tokenizer.GetNextToken();

-    if ( !token.ToLong(&version) || version < 0 || version > 1 )
+    if ( !token.ToULong(&version) || version > 1 )

         return false;
 
     token = tokenizer.GetNextToken();
         return false;
 
     token = tokenizer.GetNextToken();


@@ -842,7 +841,7 @@ wxString wxNativeFontInfo::ToUserString() const
             // that the different words which compose this facename are
             // not different adjectives or other data but rather all parts
             // of the facename
             // that the different words which compose this facename are
             // not different adjectives or other data but rather all parts
             // of the facename

-            desc << wxT(" '") << face << _("'");
+            desc << wxT(" '") << face << wxT("'");

         }
         else
             desc << wxT(' ') << face;
         }
         else
             desc << wxT(' ') << face;