compilation fix (use int instead of wxDLFlags as parameter type, since the flags...

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index ad280cef8e4c2ddba8e9067ab7417feef10737d5..94b9bab49bf9940bfa1630b6326bf13c0d67078d 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -18,18 +18,19 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation "fontbase.h"
+#pragma implementation "fontbase.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-    #pragma hdrstop
+#pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/font.h"
+#include "wx/font.h"
+#include "wx/intl.h"

 #endif // WX_PRECOMP
 
 #include "wx/gdicmn.h"
 #endif // WX_PRECOMP
 
 #include "wx/gdicmn.h"


@@ -82,7 +83,7 @@ wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
     wxNativeFontInfo *fontInfo = new wxNativeFontInfo();
 
     fontInfo->SetPointSize(GetPointSize());
     wxNativeFontInfo *fontInfo = new wxNativeFontInfo();
 
     fontInfo->SetPointSize(GetPointSize());

-    fontInfo->SetFamily(GetFamily());
+    fontInfo->SetFamily((wxFontFamily)GetFamily());

     fontInfo->SetStyle((wxFontStyle)GetStyle());
     fontInfo->SetWeight((wxFontWeight)GetWeight());
     fontInfo->SetUnderlined(GetUnderlined());
     fontInfo->SetStyle((wxFontStyle)GetStyle());
     fontInfo->SetWeight((wxFontWeight)GetWeight());
     fontInfo->SetUnderlined(GetUnderlined());


@@ -256,7 +257,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;

-    family = (int)l;
+    family = (wxFontFamily)l;

 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )


@@ -338,6 +339,11 @@ wxString wxNativeFontInfo::GetFaceName() const
     return faceName;
 }
 
     return faceName;
 }
 

+wxFontFamily wxNativeFontInfo::GetFamily() const
+{
+    return family;
+}
+

 wxFontEncoding wxNativeFontInfo::GetEncoding() const
 {
     return encoding;
 wxFontEncoding wxNativeFontInfo::GetEncoding() const
 {
     return encoding;


@@ -365,7 +371,12 @@ void wxNativeFontInfo::SetUnderlined(bool underlined_)
 
 void wxNativeFontInfo::SetFaceName(wxString facename_)
 {
 
 void wxNativeFontInfo::SetFaceName(wxString facename_)
 {

-    facename = facename_;
+    faceName = facename_;
+}
+
+void wxNativeFontInfo::SetFamily(wxFontFamily family_)
+{
+    family = family_;

 }
 
 void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_)
 }
 
 void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_)


@@ -423,19 +434,31 @@ wxString wxNativeFontInfo::ToUserString() const
             // we don't distinguish between the two for now anyhow...
         case wxFONTSTYLE_ITALIC:
         case wxFONTSTYLE_SLANT:
             // we don't distinguish between the two for now anyhow...
         case wxFONTSTYLE_ITALIC:
         case wxFONTSTYLE_SLANT:

-            desc << _("italic ");
+            desc << _("italic");

             break;
     }
 
             break;
     }
 

-    if ( !facename.empty() )
+    wxString face = GetFaceName();
+    if ( !face.empty() )
+    {
+        desc << _T(' ') << face;
+    }
+
+    int size = GetPointSize();
+    if ( size != wxNORMAL_FONT->GetPointSize() )

     {
     {

-        desc << facename << _T(' ');
+        desc << _T(' ') << size;

     }
 
     }
 

-    if ( pointsize != wxNORMAL_FONT->GetPointSize() )
+#if wxUSE_FONTMAP
+    wxFontEncoding enc = GetEncoding();
+    if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )

     {
     {

-        desc << pointsize;
+        desc << _T(' ') << wxTheFontMapper->GetEncodingName(enc);

     }
     }

+#endif // wxUSE_FONTMAP
+
+    return desc;

 }
 
 bool wxNativeFontInfo::FromUserString(const wxString& s)
 }
 
 bool wxNativeFontInfo::FromUserString(const wxString& s)


@@ -450,7 +473,10 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
 
     wxString face;
     unsigned long size;
 
     wxString face;
     unsigned long size;

+
+#if wxUSE_FONTMAP

     wxFontEncoding encoding;
     wxFontEncoding encoding;

+#endif // wxUSE_FONTMAP

 
     while ( tokenizer.HasMoreTokens() )
     {
 
     while ( tokenizer.HasMoreTokens() )
     {


@@ -478,13 +504,15 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
         }
         else if ( token.ToULong(&size) )
         {
         }
         else if ( token.ToULong(&size) )
         {

-            pointsize = (int)size;
+            SetPointSize(size);

         }
         }

+#if wxUSE_FONTMAP

         else if ( (encoding = wxTheFontMapper->CharsetToEncoding(token, FALSE))
                     != wxFONTENCODING_DEFAULT )
         {
             SetEncoding(encoding);
         }
         else if ( (encoding = wxTheFontMapper->CharsetToEncoding(token, FALSE))
                     != wxFONTENCODING_DEFAULT )
         {
             SetEncoding(encoding);
         }

+#endif // wxUSE_FONTMAP

         else // assume it is the face name
         {
             if ( !face.empty() )
         else // assume it is the face name
         {
             if ( !face.empty() )