fixed (?) crashes because of default GUI font being deleted

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 1da01a2ed06703f39d210b8fafc7a90524da35fc..c8a4c8da16b251022b6d1cb634d7683328fea849 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -493,6 +493,12 @@ GdkFont *GtkGetDefaultGuiFont()
         }
         gtk_widget_destroy( widget );
     }
         }
         gtk_widget_destroy( widget );
     }

+    else
+    {
+        // already have it, but ref it once more before returning
+        gdk_font_ref(g_systemDefaultGuiFont);
+    }
+

     return g_systemDefaultGuiFont;
 }
 
     return g_systemDefaultGuiFont;
 }
 

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 1da01a2ed06703f39d210b8fafc7a90524da35fc..c8a4c8da16b251022b6d1cb634d7683328fea849 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -493,6 +493,12 @@ GdkFont *GtkGetDefaultGuiFont()
         }
         gtk_widget_destroy( widget );
     }
         }
         gtk_widget_destroy( widget );
     }

+    else
+    {
+        // already have it, but ref it once more before returning
+        gdk_font_ref(g_systemDefaultGuiFont);
+    }
+

     return g_systemDefaultGuiFont;
 }
 
     return g_systemDefaultGuiFont;
 }