Warning fix.

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index d173a4dfdc2b6c05874495fff529f009c79929d5..743667fa2ae922e9befe0b821759c48fcdef7b7e 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     20.09.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     20.09.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-#pragma implementation "fontbase.h"
-#endif
-

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


@@ -29,11 +25,19 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

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

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

+
+#if defined(__WXMSW__)
+  #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
+  #include  "wx/msw/winundef.h"
+#endif
+

 #include "wx/fontutil.h" // for wxNativeFontInfo
 #include "wx/fontmap.h"
 
 #include "wx/fontutil.h" // for wxNativeFontInfo
 #include "wx/fontmap.h"
 


@@ -43,6 +47,64 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
+
+static void AdjustFontSize(wxFont& font, wxDC& dc, const wxSize& pixelSize)
+{
+    int currentSize = 0;
+    int largestGood = 0;
+    int smallestBad = 0;
+
+    bool initialGoodFound = false;
+    bool initialBadFound = false;
+
+    // NB: this assignment was separated from the variable definition
+    // in order to fix a gcc v3.3.3 compiler crash
+    currentSize = font.GetPointSize();
+    while (currentSize > 0)
+    {
+        dc.SetFont(font);
+
+        // if currentSize (in points) results in a font that is smaller
+        // than required by pixelSize it is considered a good size
+        if (dc.GetCharHeight() <= pixelSize.GetHeight() &&
+                (!pixelSize.GetWidth() ||
+                 dc.GetCharWidth() <= pixelSize.GetWidth()))
+        {
+            largestGood = currentSize;
+            initialGoodFound = true;
+        }
+        else
+        {
+            smallestBad = currentSize;
+            initialBadFound = true;
+        }
+        if (!initialGoodFound)
+        {
+            currentSize /= 2;
+        }
+        else if (!initialBadFound)
+        {
+            currentSize *= 2;
+        }
+        else
+        {
+            int distance = smallestBad - largestGood;
+            if (distance == 1)
+                break;
+
+            currentSize = largestGood + distance / 2;
+        }
+
+        font.SetPointSize(currentSize);
+    }
+
+    if (currentSize != largestGood)
+        font.SetPointSize(largestGood);
+}
+

 // ----------------------------------------------------------------------------
 // wxFontBase
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFontBase
 // ----------------------------------------------------------------------------


@@ -77,31 +139,87 @@ wxFont *wxFontBase::New(int size,
     return new wxFont(size, family, style, weight, underlined, face, encoding);
 }
 
     return new wxFont(size, family, style, weight, underlined, face, encoding);
 }
 

-/* static */
-wxFont *wxFontBase::New(int pointSize,
-                        wxFontFamily family,
-                        int flags,
-                        const wxString& face,
-                        wxFontEncoding encoding)
+static inline int flags2Style(int flags)

 {
 {

-    return New
-           (
-                pointSize,
-                family,
-                flags & wxFONTFLAG_ITALIC
+    return flags & wxFONTFLAG_ITALIC

                     ? wxFONTSTYLE_ITALIC
                     : flags & wxFONTFLAG_SLANT
                         ? wxFONTSTYLE_SLANT
                     ? wxFONTSTYLE_ITALIC
                     : flags & wxFONTFLAG_SLANT
                         ? wxFONTSTYLE_SLANT

-                        : wxFONTSTYLE_NORMAL,
-                flags & wxFONTFLAG_LIGHT
+                        : wxFONTSTYLE_NORMAL;
+}
+
+static inline int flags2Weight(int flags)
+{
+    return flags & wxFONTFLAG_LIGHT

                     ? wxFONTWEIGHT_LIGHT
                     : flags & wxFONTFLAG_BOLD
                         ? wxFONTWEIGHT_BOLD
                     ? wxFONTWEIGHT_LIGHT
                     : flags & wxFONTFLAG_BOLD
                         ? wxFONTWEIGHT_BOLD

-                        : wxFONTWEIGHT_NORMAL,
-                (flags & wxFONTFLAG_UNDERLINED) != 0,
-                face,
-                encoding
-           );
+                        : wxFONTWEIGHT_NORMAL;
+}
+
+static inline bool flags2Underlined(int flags)
+{
+    return (flags & wxFONTFLAG_UNDERLINED) != 0;
+}
+
+/* static */
+wxFont *wxFontBase::New(int pointSize,
+                        wxFontFamily family,
+                        int flags,
+                        const wxString& face,
+                        wxFontEncoding encoding)
+{
+    return New(pointSize, family, flags2Style(flags), flags2Weight(flags),
+               flags2Underlined(flags), face, encoding);
+}
+
+/* static */
+wxFont *wxFontBase::New(const wxSize& pixelSize,
+                        int family,
+                        int style,
+                        int weight,
+                        bool underlined,
+                        const wxString& face,
+                        wxFontEncoding encoding)
+{
+#if defined(__WXMSW__)
+    return new wxFont(pixelSize, family, style, weight, underlined,
+                      face, encoding);
+#else
+    wxFont *self = New(10, family, style, weight, underlined, face, encoding);
+    wxScreenDC dc;
+    AdjustFontSize(*(wxFont *)self, dc, pixelSize);
+    return self;
+#endif
+}
+
+/* static */
+wxFont *wxFontBase::New(const wxSize& pixelSize,
+                        wxFontFamily family,
+                        int flags,
+                        const wxString& face,
+                        wxFontEncoding encoding)
+{
+    return New(pixelSize, family, flags2Style(flags), flags2Weight(flags),
+               flags2Underlined(flags), face, encoding);
+}
+
+wxSize wxFontBase::GetPixelSize() const
+{
+    wxScreenDC dc;
+    dc.SetFont(*(wxFont *)this);
+    return wxSize(dc.GetCharWidth(), dc.GetCharHeight());
+}
+
+bool wxFontBase::IsUsingSizeInPixels() const
+{
+    return false;
+}
+
+void wxFontBase::SetPixelSize( const wxSize& pixelSize )
+{
+    wxScreenDC dc;
+    AdjustFontSize(*(wxFont *)this, dc, pixelSize);

 }
 
 /* static */
 }
 
 /* static */


@@ -125,25 +243,6 @@ bool wxFontBase::IsFixedWidth() const
     return GetFamily() == wxFONTFAMILY_TELETYPE;
 }
 
     return GetFamily() == wxFONTFAMILY_TELETYPE;
 }
 

-wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
-{
-#ifdef wxNO_NATIVE_FONTINFO
-    wxNativeFontInfo *fontInfo = new wxNativeFontInfo();
-
-    fontInfo->SetPointSize(GetPointSize());
-    fontInfo->SetFamily((wxFontFamily)GetFamily());
-    fontInfo->SetStyle((wxFontStyle)GetStyle());
-    fontInfo->SetWeight((wxFontWeight)GetWeight());
-    fontInfo->SetUnderlined(GetUnderlined());
-    fontInfo->SetFaceName(GetFaceName());
-    fontInfo->SetEncoding(GetEncoding());
-
-    return fontInfo;
-#else
-    return (wxNativeFontInfo *)NULL;
-#endif
-}
-

 void wxFontBase::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 {
 #ifdef wxNO_NATIVE_FONTINFO
 void wxFontBase::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 {
 #ifdef wxNO_NATIVE_FONTINFO


@@ -162,11 +261,10 @@ void wxFontBase::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 wxString wxFontBase::GetNativeFontInfoDesc() const
 {
     wxString fontDesc;
 wxString wxFontBase::GetNativeFontInfoDesc() const
 {
     wxString fontDesc;

-    wxNativeFontInfo *fontInfo = GetNativeFontInfo();
+    const wxNativeFontInfo *fontInfo = GetNativeFontInfo();

     if ( fontInfo )
     {
         fontDesc = fontInfo->ToString();
     if ( fontInfo )
     {
         fontDesc = fontInfo->ToString();

-        delete fontInfo;

     }
 
     return fontDesc;
     }
 
     return fontDesc;


@@ -175,11 +273,10 @@ wxString wxFontBase::GetNativeFontInfoDesc() const
 wxString wxFontBase::GetNativeFontInfoUserDesc() const
 {
     wxString fontDesc;
 wxString wxFontBase::GetNativeFontInfoUserDesc() const
 {
     wxString fontDesc;

-    wxNativeFontInfo *fontInfo = GetNativeFontInfo();
+    const wxNativeFontInfo *fontInfo = GetNativeFontInfo();

     if ( fontInfo )
     {
         fontDesc = fontInfo->ToUserString();
     if ( fontInfo )
     {
         fontDesc = fontInfo->ToUserString();

-        delete fontInfo;

     }
 
     return fontDesc;
     }
 
     return fontDesc;


@@ -203,14 +300,6 @@ void wxFontBase::SetNativeFontInfoUserDesc(const wxString& info)
     }
 }
 
     }
 }
 

-wxFont& wxFont::operator=(const wxFont& font)
-{
-    if ( this != &font )
-        Ref(font);
-
-    return (wxFont &)*this;
-}
-

 bool wxFontBase::operator==(const wxFont& font) const
 {
     // either it is the same font, i.e. they share the same common data or they
 bool wxFontBase::operator==(const wxFont& font) const
 {
     // either it is the same font, i.e. they share the same common data or they


@@ -299,42 +388,42 @@ bool wxNativeFontInfo::FromString(const wxString& s)
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )

-        return FALSE;
+        return false;

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

-        return FALSE;
+        return false;

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

-        return FALSE;
+        return false;

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

-        return FALSE;
+        return false;

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

-        return FALSE;
+        return false;

     underlined = l != 0;
 
     faceName = tokenizer.GetNextToken();
 
 #ifndef __WXMAC__
     if( !faceName )
     underlined = l != 0;
 
     faceName = tokenizer.GetNextToken();
 
 #ifndef __WXMAC__
     if( !faceName )

-        return FALSE;
+        return false;

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

-        return FALSE;
+        return false;

     encoding = (wxFontEncoding)l;
 
     encoding = (wxFontEncoding)l;
 

-    return TRUE;
+    return true;

 }
 
 wxString wxNativeFontInfo::ToString() const
 }
 
 wxString wxNativeFontInfo::ToString() const


@@ -356,11 +445,11 @@ wxString wxNativeFontInfo::ToString() const
 
 void wxNativeFontInfo::Init()
 {
 
 void wxNativeFontInfo::Init()
 {

-    pointSize = wxNORMAL_FONT->GetPointSize();
+    pointSize = 0;

     family = wxFONTFAMILY_DEFAULT;
     style = wxFONTSTYLE_NORMAL;
     weight = wxFONTWEIGHT_NORMAL;
     family = wxFONTFAMILY_DEFAULT;
     style = wxFONTSTYLE_NORMAL;
     weight = wxFONTWEIGHT_NORMAL;

-    underlined = FALSE;
+    underlined = false;

     faceName.clear();
     encoding = wxFONTENCODING_DEFAULT;
 }
     faceName.clear();
     encoding = wxFONTENCODING_DEFAULT;
 }


@@ -420,7 +509,7 @@ void wxNativeFontInfo::SetUnderlined(bool underlined_)
     underlined = underlined_;
 }
 
     underlined = underlined_;
 }
 

-void wxNativeFontInfo::SetFaceName(wxString facename_)
+void wxNativeFontInfo::SetFaceName(const wxString& facename_)

 {
     faceName = facename_;
 }
 {
     faceName = facename_;
 }


@@ -505,7 +594,7 @@ wxString wxNativeFontInfo::ToUserString() const
     wxFontEncoding enc = GetEncoding();
     if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
     {
     wxFontEncoding enc = GetEncoding();
     if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
     {

-        desc << _T(' ') << wxFontMapper::Get()->GetEncodingName(enc);
+        desc << _T(' ') << wxFontMapper::GetEncodingName(enc);

     }
 #endif // wxUSE_FONTMAP
 
     }
 #endif // wxUSE_FONTMAP
 


@@ -534,12 +623,12 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
         wxString token = tokenizer.GetNextToken();
 
         // normalize it
         wxString token = tokenizer.GetNextToken();
 
         // normalize it

-        token.Trim(TRUE).Trim(FALSE).MakeLower();
+        token.Trim(true).Trim(false).MakeLower();

 
         // look for the known tokens
         if ( token == _T("underlined") || token == _("underlined") )
         {
 
         // look for the known tokens
         if ( token == _T("underlined") || token == _("underlined") )
         {

-            SetUnderlined(TRUE);
+            SetUnderlined(true);

         }
         else if ( token == _T("light") || token == _("light") )
         {
         }
         else if ( token == _T("light") || token == _("light") )
         {


@@ -558,7 +647,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
             SetPointSize(size);
         }
 #if wxUSE_FONTMAP
             SetPointSize(size);
         }
 #if wxUSE_FONTMAP

-        else if ( (encoding = wxFontMapper::Get()->CharsetToEncoding(token, FALSE))
+        else if ( (encoding = wxFontMapper::Get()->CharsetToEncoding(token, false))

                     != wxFONTENCODING_DEFAULT )
         {
             SetEncoding(encoding);
                     != wxFONTENCODING_DEFAULT )
         {
             SetEncoding(encoding);


@@ -593,7 +682,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
         SetFaceName(face);
     }
 
         SetFaceName(face);
     }
 

-    return TRUE;
+    return true;

 }
 
 #endif // generic or wxMSW or wxOS2
 }
 
 #endif // generic or wxMSW or wxOS2