Fixed border drawing bug when width is more than 1

[wxWidgets.git] / src / mgl / fontmgr.cpp

diff --git a/src/mgl/fontmgr.cpp b/src/mgl/fontmgr.cpp
index 4bcae31029a800dae6ccc25185b08a01442decf6..63449e2739b8dd1fd6dd1613f67e92849f11021c 100644 (file)
--- a/src/mgl/fontmgr.cpp
+++ b/src/mgl/fontmgr.cpp
@@ -16,6 +16,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+

 #include "wx/private/fontmgr.h"
 #include "wx/sysopt.h"
 
 #include "wx/private/fontmgr.h"
 #include "wx/sysopt.h"
 


@@ -36,7 +40,7 @@ wxFontInstance::wxFontInstance(float ptSize, bool aa, font_lib_t *fontLib)
 {
     m_font = MGL_loadFontInstance(fontLib, ptSize, 0.0, 0.0, aa);
 
 {
     m_font = MGL_loadFontInstance(fontLib, ptSize, 0.0, 0.0, aa);
 

-    wxASSERT_MSG( m_font, _T("cannot create font instance") );
+    wxASSERT_MSG( m_font, wxT("cannot create font instance") );

 }
 
 wxFontInstance::~wxFontInstance()
 }
 
 wxFontInstance::~wxFontInstance()


@@ -55,7 +59,7 @@ void wxFontFace::Acquire()
 
     if ( m_refCnt == 1 )
     {
 
     if ( m_refCnt == 1 )
     {

-        wxCHECK_RET( m_fontLib == NULL, _T("font lib already created") );
+        wxCHECK_RET( m_fontLib == NULL, wxT("font lib already created") );

 
         wxLogTrace("mgl_font", "opening library '%s'", m_fileName.mb_str());
         m_fontLib = MGL_openFontLib(m_fileName.fn_str());
 
         wxLogTrace("mgl_font", "opening library '%s'", m_fileName.mb_str());
         m_fontLib = MGL_openFontLib(m_fileName.fn_str());


@@ -68,7 +72,7 @@ void wxFontFace::Release()
 
     if ( m_refCnt == 0 )
     {
 
     if ( m_refCnt == 0 )
     {

-        wxCHECK_RET( m_fontLib != NULL, _T("font lib not created") );
+        wxCHECK_RET( m_fontLib != NULL, wxT("font lib not created") );

 
         wxLogTrace("mgl_font", "closing library '%s'", m_fileName.mb_str());
         MGL_closeFontLib(m_fontLib);
 
         wxLogTrace("mgl_font", "closing library '%s'", m_fileName.mb_str());
         MGL_closeFontLib(m_fontLib);


@@ -90,7 +94,7 @@ wxFontInstance *wxFontFace::GetFontInstance(float ptSize, bool aa)
     }
 
     // Small characters don't look good when antialiased with the algorithm
     }
 
     // Small characters don't look good when antialiased with the algorithm

-    // that FreeType uses (mere 2x2 supersampling), so lets disable AA
+    // that FreeType uses (mere 2x2 supersampling), so let's disable AA

     // completely for small fonts. Bitmap fonts are not antialiased either.
     if ( ptSize <= gs_antialiasingThreshold ||
          m_fontLib->fontLibType == MGL_BITMAPFONT_LIB )
     // completely for small fonts. Bitmap fonts are not antialiased either.
     if ( ptSize <= gs_antialiasingThreshold ||
          m_fontLib->fontLibType == MGL_BITMAPFONT_LIB )


@@ -103,7 +107,7 @@ wxFontInstance *wxFontFace::GetFontInstance(float ptSize, bool aa)
 
 wxFontInstance *wxFontFace::CreateFontInstance(float ptSize, bool aa)
 {
 
 wxFontInstance *wxFontFace::CreateFontInstance(float ptSize, bool aa)
 {

-    wxASSERT_MSG( m_fontLib, _T("font library not loaded!") );
+    wxASSERT_MSG( m_fontLib, wxT("font library not loaded!") );

 
     return new wxFontInstance(ptSize, aa, m_fontLib);
 }
 
     return new wxFontInstance(ptSize, aa, m_fontLib);
 }


@@ -132,6 +136,17 @@ wxFontBundle::wxFontBundle(const font_info_t *info)
                info->boldFace, info->boldItalicFace);
 }
 
                info->boldFace, info->boldItalicFace);
 }
 

+wxString wxFontBundle::GetName() const
+{
+    return wxString::FromAscii(m_fontInfo->familyName);
+}
+
+bool wxFontBundle::IsFixed() const
+{
+    return m_fontInfo->isFixed;
+}
+
+

 // ----------------------------------------------------------------------------
 // wxFontsManager
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFontsManager
 // ----------------------------------------------------------------------------


@@ -141,14 +156,14 @@ wxString wxFontsManager::GetDefaultFacename(wxFontFamily family) const
     switch ( family )
     {
         case wxSCRIPT:
     switch ( family )
     {
         case wxSCRIPT:

-            return _T("Script");
+            return wxT("Script");

         case wxDECORATIVE:
         case wxDECORATIVE:

-            return _T("Charter");
+            return wxT("Charter");

         case wxROMAN:
         case wxROMAN:

-            return _T("Times");
+            return wxT("Times");

         case wxTELETYPE:
         case wxMODERN:
         case wxTELETYPE:
         case wxMODERN:

-            return _T("Courier");
+            return wxT("Courier");

         case wxSWISS:
         case wxDEFAULT:
         default:
         case wxSWISS:
         case wxDEFAULT:
         default: