added default style wxFRAME_TOOL_WINDOW to creation

[wxWidgets.git] / src / msw / font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 7a55510e198d193355d2ea75f07b8f4a85552f3d..16993de87863b1204a6446b825911d04b69749ae 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -50,6 +50,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

+// the mask used to extract the pitch from LOGFONT::lfPitchAndFamily field
+static const int PITCH_MASK = FIXED_PITCH | VARIABLE_PITCH;
+

 // ----------------------------------------------------------------------------
 // wxFontRefData - the internal description of the font
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFontRefData - the internal description of the font
 // ----------------------------------------------------------------------------


@@ -270,42 +273,6 @@ void wxFontRefData::Init(int pointSize,
 
 void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
 {
 
 void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
 {

-    // we don't really need the family, what for?
-#if 0
-    // extract family from pitch-and-family
-    int lfFamily = info.lf.lfPitchAndFamily;
-    if ( lfFamily & FIXED_PITCH )
-        lfFamily -= FIXED_PITCH;
-    if ( lfFamily & VARIABLE_PITCH )
-        lfFamily -= VARIABLE_PITCH;
-
-    switch ( lfFamily )
-    {
-        case FF_ROMAN:
-            m_family = wxROMAN;
-            break;
-
-        case FF_SWISS:
-            m_family = wxSWISS;
-            break;
-
-        case FF_SCRIPT:
-            m_family = wxSCRIPT;
-            break;
-
-        case FF_MODERN:
-            m_family = wxMODERN;
-            break;
-
-        case FF_DECORATIVE:
-            m_family = wxDECORATIVE;
-            break;
-
-        default:
-            m_family = wxSWISS;
-    }
-#endif // 0
-

     // hFont may be zero, or it be passed in case we really want to
     // use the exact font created in the underlying system
     // (for example where we can't guarantee conversion from HFONT
     // hFont may be zero, or it be passed in case we really want to
     // use the exact font created in the underlying system
     // (for example where we can't guarantee conversion from HFONT


@@ -366,6 +333,8 @@ void wxNativeFontInfo::Init()
 
 int wxNativeFontInfo::GetPointSize() const
 {
 
 int wxNativeFontInfo::GetPointSize() const
 {

+    // FIXME: using the screen here results in incorrect font size calculation
+    //        for printing!

     const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
 
     return (int) (((72.0*(double)abs(lf.lfHeight)) / (double) ppInch) + 0.5);
     const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
 
     return (int) (((72.0*(double)abs(lf.lfHeight)) / (double) ppInch) + 0.5);


@@ -397,6 +366,41 @@ wxString wxNativeFontInfo::GetFaceName() const
     return lf.lfFaceName;
 }
 
     return lf.lfFaceName;
 }
 

+wxFontFamily wxNativeFontInfo::GetFamily() const
+{
+    wxFontFamily family;
+
+    // extract family from pitch-and-family
+    switch ( lf.lfPitchAndFamily & ~PITCH_MASK )
+    {
+        case FF_ROMAN:
+            family = wxFONTFAMILY_ROMAN;
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unknown LOGFONT::lfFamily value") );
+            // fall through
+
+        case FF_SWISS:
+            family = wxFONTFAMILY_SWISS;
+            break;
+
+        case FF_SCRIPT:
+            family = wxFONTFAMILY_SCRIPT;
+            break;
+
+        case FF_MODERN:
+            family = wxFONTFAMILY_MODERN;
+            break;
+
+        case FF_DECORATIVE:
+            family = wxFONTFAMILY_DECORATIVE;
+            break;
+    }
+
+    return family;
+}
+

 wxFontEncoding wxNativeFontInfo::GetEncoding() const
 {
     return wxGetFontEncFromCharSet(lf.lfCharSet);
 wxFontEncoding wxNativeFontInfo::GetEncoding() const
 {
     return wxGetFontEncFromCharSet(lf.lfCharSet);


@@ -404,9 +408,16 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
 
 void wxNativeFontInfo::SetPointSize(int pointsize)
 {
 
 void wxNativeFontInfo::SetPointSize(int pointsize)
 {

+#if wxFONT_SIZE_COMPATIBILITY
+    // Incorrect, but compatible with old wxWindows behaviour
+    lf.lfHeight = (pointSize*ppInch)/72;
+#else // wxFONT_SIZE_COMPATIBILITY
+    // FIXME: using the screen here results in incorrect font size calculation
+    //        for printing!

     const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
 
     lf.lfHeight = -(int)((pointsize*((double)ppInch)/72.0) + 0.5);
     const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
 
     lf.lfHeight = -(int)((pointsize*((double)ppInch)/72.0) + 0.5);

+#endif // wxFONT_SIZE_COMPATIBILITY/!wxFONT_SIZE_COMPATIBILITY

 }
 
 void wxNativeFontInfo::SetStyle(wxFontStyle style)
 }
 
 void wxNativeFontInfo::SetStyle(wxFontStyle style)


@@ -456,7 +467,54 @@ void wxNativeFontInfo::SetUnderlined(bool underlined)
 
 void wxNativeFontInfo::SetFaceName(wxString facename)
 {
 
 void wxNativeFontInfo::SetFaceName(wxString facename)
 {

-    wxStrncpy(lf.lfFaceName, facename, sizeof(lf.lfFaceName));
+    wxStrncpy(lf.lfFaceName, facename, WXSIZEOF(lf.lfFaceName));
+}
+
+void wxNativeFontInfo::SetFamily(wxFontFamily family)
+{
+    int ff_family;
+    wxString facename;
+
+    switch ( family )
+    {
+        case wxSCRIPT:
+            ff_family = FF_SCRIPT;
+            facename = _T("Script");
+            break;
+
+        case wxDECORATIVE:
+            ff_family = FF_DECORATIVE;
+            facename = _T("Old English Text MT");
+            break;
+
+        case wxROMAN:
+            ff_family = FF_ROMAN;
+            facename = _T("Times New Roman");
+            break;
+
+        case wxTELETYPE:
+        case wxMODERN:
+            ff_family = FF_MODERN;
+            facename = _T("Courier New");
+            break;
+
+        case wxSWISS:
+            ff_family = FF_SWISS;
+            facename = _T("Arial");
+            break;
+
+        case wxDEFAULT:
+        default:
+            ff_family = FF_SWISS;
+            facename = _T("MS Sans Serif");
+    }
+
+    lf.lfPitchAndFamily = DEFAULT_PITCH | ff_family;
+
+    if ( !wxStrlen(lf.lfFaceName) )
+    {
+        SetFaceName(facename);
+    }

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


@@ -465,18 +523,21 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
 #if wxUSE_FONTMAP
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
 #if wxUSE_FONTMAP

-        if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
-#endif // wxUSE_FONTMAP
+        if ( wxTheFontMapper->GetAltForEncoding(encoding, &info) )

         {
         {

-            // unsupported encoding, replace with the default
-            info.charset = ANSI_CHARSET;
+            if ( !info.facename.empty() )
+            {
+                // if we have this encoding only in some particular facename, use
+                // the facename - it is better to show the correct characters in a
+                // wrong facename than unreadable text in a correct one
+                SetFaceName(info.facename);
+            }

         }
         }

-        else if ( !info.facename.empty() )
+        else
+#endif // wxUSE_FONTMAP

         {
         {

-            // if we have this encoding only in some particular facename, use
-            // the facename - it is better to show the correct characters in a
-            // wrong facename than unreadable text in a correct one
-            SetFaceName(info.facename);
+            // unsupported encoding, replace with the default
+            info.charset = DEFAULT_CHARSET;

         }
     }
 
         }
     }
 


@@ -846,3 +907,18 @@ wxNativeFontInfo *wxFont::GetNativeFontInfo() const
     return 0;
 }
 
     return 0;
 }
 

+bool wxFont::IsFixedWidth() const
+{
+    if ( M_FONTDATA->HasNativeFontInfo() )
+    {
+        // the two low-order bits specify the pitch of the font, the rest is
+        // family
+        BYTE pitch = M_FONTDATA->GetNativeFontInfo().
+                        lf.lfPitchAndFamily & PITCH_MASK;
+
+        return pitch == FIXED_PITCH;
+    }
+
+    return wxFontBase::IsFixedWidth();
+}
+