fixed unused var warning

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

diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index ff9f73343d4d64d5a113834a7a3ffe666976a056..1b9410516b98e21f9cc65a809478869ff7770f7f 100644 (file)
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        font.cpp
+// Name:        src/mgl/font.cpp

 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


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

-#ifdef __GNUG__
-    #pragma implementation "font.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"
 


@@ -26,13 +22,18 @@
 #endif
 
 #include "wx/font.h"
 #endif
 
 #include "wx/font.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/cmndata.h"
+    #include "wx/gdicmn.h"
+#endif
+

 #include "wx/fontutil.h"
 #include "wx/fontutil.h"

-#include "wx/cmndata.h"
-#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/gdicmn.h"

 #include "wx/tokenzr.h"
 #include "wx/tokenzr.h"

-#include "wx/settings.h"
+#include "wx/mgl/private.h"

 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 
 // ----------------------------------------------------------------------------
 // wxFontRefData


@@ -45,7 +46,7 @@ public:
                   int family = wxDEFAULT,
                   int style = wxDEFAULT,
                   int weight = wxDEFAULT,
                   int family = wxDEFAULT,
                   int style = wxDEFAULT,
                   int weight = wxDEFAULT,

-                  bool underlined = FALSE,
+                  bool underlined = false,

                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     wxFontRefData(const wxFontRefData& data);
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     wxFontRefData(const wxFontRefData& data);


@@ -73,6 +74,8 @@ private:
     wxMGLFontLibrary *m_library;
     bool              m_valid;
 
     wxMGLFontLibrary *m_library;
     bool              m_valid;
 

+    wxNativeFontInfo  m_info;
+

     friend class wxFont;
 };
 
     friend class wxFont;
 };
 


@@ -118,7 +121,7 @@ void wxFontRefData::Init(int pointSize,
     m_encoding = encoding;
 
     m_library = NULL;
     m_encoding = encoding;
 
     m_library = NULL;

-    m_valid = FALSE;
+    m_valid = false;

 }
 
 wxFontRefData::wxFontRefData(const wxFontRefData& data)
 }
 
 wxFontRefData::wxFontRefData(const wxFontRefData& data)


@@ -171,7 +174,7 @@ bool wxFont::Create(int pointSize,
 {
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, face, encoding);
 {
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, face, encoding);

-    return TRUE;
+    return true;

 }
 
 struct font_t *wxFont::GetMGLfont_t(float scale, bool antialiased)
 }
 
 struct font_t *wxFont::GetMGLfont_t(float scale, bool antialiased)


@@ -185,26 +188,23 @@ struct font_t *wxFont::GetMGLfont_t(float scale, bool antialiased)
             old->DecRef();
     }
 
             old->DecRef();
     }
 

-    wxMGLFontInstance *instance = 
+    wxMGLFontInstance *instance =

         M_FONTDATA->m_library->GetFontInstance(this, scale, antialiased);
 
     return instance->GetMGLfont_t();
 }
 
         M_FONTDATA->m_library->GetFontInstance(this, scale, antialiased);
 
     return instance->GetMGLfont_t();
 }
 

-void wxFont::Unshare()
+wxObjectRefData *wxFont::CreateRefData() const

 {
 {

-    if ( !m_refData )
-    {
-        m_refData = new wxFontRefData();
-    }
-    else
-    {
-        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-        UnRef();
-        m_refData = ref;
-    }
+    return new wxFontRefData;
+}
+
+wxObjectRefData *wxFont::CloneRefData(const wxObjectRefData *data) const
+{
+    return new wxFontRefData(*(wxFontRefData *)data);

 }
 
 }
 

+

 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------


@@ -218,7 +218,7 @@ int wxFont::GetPointSize() const
 
 wxString wxFont::GetFaceName() const
 {
 
 wxString wxFont::GetFaceName() const
 {

-    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );

 
     return M_FONTDATA->m_faceName;
 }
 
     return M_FONTDATA->m_faceName;
 }


@@ -246,7 +246,7 @@ int wxFont::GetWeight() const
 
 bool wxFont::GetUnderlined() const
 {
 
 bool wxFont::GetUnderlined() const
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );

 
     return M_FONTDATA->m_underlined;
 }
 
     return M_FONTDATA->m_underlined;
 }


@@ -259,6 +259,21 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
     return M_FONTDATA->m_encoding;
 }
 

+bool wxFont::IsFixedWidth() const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
+
+    return (bool)(M_FONTDATA->m_library->GetFamily()->GetInfo()->isFixed);
+}
+
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );
+
+    M_FONTDATA->m_info.InitFromFont(*this);
+
+    return &(M_FONTDATA->m_info);
+}

 
 // ----------------------------------------------------------------------------
 // change font attributes
 
 // ----------------------------------------------------------------------------
 // change font attributes


@@ -266,55 +281,57 @@ wxFontEncoding wxFont::GetEncoding() const
 
 void wxFont::SetPointSize(int pointSize)
 {
 
 void wxFont::SetPointSize(int pointSize)
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->m_pointSize = pointSize;
 
     M_FONTDATA->m_pointSize = pointSize;

-    M_FONTDATA->m_valid = FALSE;
+    M_FONTDATA->m_valid = false;

 }
 
 void wxFont::SetFamily(int family)
 {
 }
 
 void wxFont::SetFamily(int family)
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->m_family = family;
 
     M_FONTDATA->m_family = family;

-    M_FONTDATA->m_valid = FALSE;
+    M_FONTDATA->m_valid = false;

 }
 
 void wxFont::SetStyle(int style)
 {
 }
 
 void wxFont::SetStyle(int style)
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->m_style = style;
 
     M_FONTDATA->m_style = style;

-    M_FONTDATA->m_valid = FALSE;
+    M_FONTDATA->m_valid = false;

 }
 
 void wxFont::SetWeight(int weight)
 {
 }
 
 void wxFont::SetWeight(int weight)
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->m_weight = weight;
 
     M_FONTDATA->m_weight = weight;

-    M_FONTDATA->m_valid = FALSE;
+    M_FONTDATA->m_valid = false;

 }
 
 }
 

-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)

 {
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->m_faceName = faceName;
 
     M_FONTDATA->m_faceName = faceName;

-    M_FONTDATA->m_valid = FALSE;
+    M_FONTDATA->m_valid = false;
+
+    return wxFontBase::SetFaceName(faceName);

 }
 
 void wxFont::SetUnderlined(bool underlined)
 {
 }
 
 void wxFont::SetUnderlined(bool underlined)
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->m_underlined = underlined;
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 {
 
     M_FONTDATA->m_underlined = underlined;
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 {

-    Unshare();
+    AllocExclusive();

 
     M_FONTDATA->m_encoding = encoding;
 
     M_FONTDATA->m_encoding = encoding;

-    M_FONTDATA->m_valid = FALSE;
+    M_FONTDATA->m_valid = false;

 }
 }