toplevel code transferred to wxTopLevelWindow

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

diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index d46be6a92a8c51d7282b720a39cc79330711d279..ff9f73343d4d64d5a113834a7a3ffe666976a056 100644 (file)
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -18,6 +18,13 @@
     #pragma implementation "font.h"
 #endif
 
     #pragma implementation "font.h"
 #endif
 

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

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


@@ -27,8 +34,6 @@
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
 
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
 

-#include <strings.h>
-

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


@@ -125,6 +130,7 @@ wxFontRefData::wxFontRefData(const wxFontRefData& data)
     m_valid = data.m_valid;
     if ( m_library )
         m_library->IncRef();
     m_valid = data.m_valid;
     if ( m_library )
         m_library->IncRef();

+    wxLogTrace("mgl_font", "created fntrefdata %p, library is %p", this, m_library);

 }
 
 wxFontRefData::wxFontRefData(int size, int family, int style,
 }
 
 wxFontRefData::wxFontRefData(int size, int family, int style,


@@ -133,10 +139,12 @@ wxFontRefData::wxFontRefData(int size, int family, int style,
                              wxFontEncoding encoding)
 {
     Init(size, family, style, weight, underlined, faceName, encoding);
                              wxFontEncoding encoding)
 {
     Init(size, family, style, weight, underlined, faceName, encoding);

+    wxLogTrace("mgl_font", "created fntrefdata %p, library is %p", this, m_library);

 }
 
 wxFontRefData::~wxFontRefData()
 {
 }
 
 wxFontRefData::~wxFontRefData()
 {

+    wxLogTrace("mgl_font", "destructing fntrefdata %p, library is %p", this, m_library);

     if ( m_library )
         m_library->DecRef();
 }
     if ( m_library )
         m_library->DecRef();
 }


@@ -147,12 +155,6 @@ wxFontRefData::~wxFontRefData()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 

-void wxFont::Init()
-{
-    if (wxTheFontList)
-        wxTheFontList->Append(this);
-}
-

 bool wxFont::Create(const wxNativeFontInfo& info)
 {
     return Create(info.pointSize, info.family, info.style, info.weight,
 bool wxFont::Create(const wxNativeFontInfo& info)
 {
     return Create(info.pointSize, info.family, info.style, info.weight,


@@ -203,12 +205,6 @@ void wxFont::Unshare()
     }
 }
 
     }
 }
 

-wxFont::~wxFont()
-{
-    if (wxTheFontList)
-        wxTheFontList->DeleteObject(this);
-}
-

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