wxMGL bugfixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 00:13:37 +00:00
parent 2d2c394b59
commit fd495ab3ea
6 changed files with 32 additions and 35 deletions
--- a/src/mgl/fontutil.cpp
+++ b/src/mgl/fontutil.cpp
@@ -323,20 +323,17 @@ bool wxMGLFontFamily::HasFace(int type) const
 wxMGLFontLibrary *wxFontsManager::GetFontLibrary(wxFont *font)
 {
    wxMGLFontFamily *family;
-    wxString facename;
    int type;
+    wxString facename = font->GetFaceName();
    
-    if ( facename )
-        family = GetFamily(font->GetFaceName());
+    if ( !facename.IsEmpty() )
+        family = GetFamily(facename);
    else
        family = NULL;
-    if ( family )
-        facename = font->GetFaceName();
-    else
-        facename.Empty();
-    
+
    if ( !family )
    {
+        facename.Empty();
        switch (font->GetFamily())
        {
            case wxSCRIPT: