added carbonaccessors.o

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

diff --git a/src/mgl/fontutil.cpp b/src/mgl/fontutil.cpp
index 78d0443857cefe7eb7e6af43e2874300d152dd40..7e262908627bede47d0eef736c7037f38c51ad6e 100644 (file)
--- a/src/mgl/fontutil.cpp
+++ b/src/mgl/fontutil.cpp
@@ -21,16 +21,15 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/log.h"
+    #include "wx/fontutil.h"
+    #include "wx/fontmap.h"
+    #include "wx/tokenzr.h"
+    #include "wx/hash.h"

 #endif // PCH
 
 
 #endif // PCH
 
 

-#include "wx/fontutil.h"
-#include "wx/fontmap.h"
-#include "wx/tokenzr.h"
-#include "wx/hash.h"
-#include "wx/module.h"

 #include "wx/listimpl.cpp"
 #include "wx/listimpl.cpp"

-#include "wx/log.h"

 #include "wx/mgl/private.h"
 
 #include <mgraph.h>
 #include "wx/mgl/private.h"
 
 #include <mgraph.h>


@@ -323,20 +322,17 @@ bool wxMGLFontFamily::HasFace(int type) const
 wxMGLFontLibrary *wxFontsManager::GetFontLibrary(wxFont *font)
 {
     wxMGLFontFamily *family;
 wxMGLFontLibrary *wxFontsManager::GetFontLibrary(wxFont *font)
 {
     wxMGLFontFamily *family;

-    wxString facename;

     int type;
     int type;

+    wxString facename = font->GetFaceName();

     
     

-    if ( facename )
-        family = GetFamily(font->GetFaceName());
+    if ( !facename.IsEmpty() )
+        family = GetFamily(facename);

     else
         family = NULL;
     else
         family = NULL;

-    if ( family )
-        facename = font->GetFaceName();
-    else
-        facename.Empty();
-    
+

     if ( !family )
     {
     if ( !family )
     {

+        facename.Empty();

         switch (font->GetFamily())
         {
             case wxSCRIPT:
         switch (font->GetFamily())
         {
             case wxSCRIPT:


@@ -433,24 +429,3 @@ wxMGLFontFamily *wxFontsManager::GetFamily(const wxString& name) const
 
 
 wxFontsManager *wxTheFontsManager = NULL;
 
 
 wxFontsManager *wxTheFontsManager = NULL;

-
-
-// A module that takes care of fonts DB initialization and destruction:
-
-class wxFontutilModule: public wxModule
-{
-DECLARE_DYNAMIC_CLASS(wxFontutilModule)
-public:
-    wxFontutilModule() {}
-    bool OnInit() 
-    {
-        wxTheFontsManager = new wxFontsManager;
-        return TRUE; 
-    }
-    void OnExit() 
-    { 
-        delete wxTheFontsManager;
-    }
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxFontutilModule, wxModule)