Tried to fix problem with wrong fonts in tool tips.

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

src/gtk/font.cpp

@@ -397,7 +397,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
 
 static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
 
-static GdkFont *GtkGetDefaultGuiFont()
+GdkFont *GtkGetDefaultGuiFont()
 {
     if (!g_systemDefaultGuiFont)
     {

src/gtk/settings.cpp

@@ -21,6 +21,8 @@
 #include <gdk/gdkprivate.h>
 #include <gtk/gtk.h>
 
+extern GdkFont *GtkGetDefaultGuiFont();
+
 
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0
@@ -234,17 +236,7 @@ wxFont wxSystemSettings::GetSystemFont( int index )
             if (!g_systemFont)
             {
 #if 0
-                GdkFont *gdk_font = (GdkFont*) NULL;
+                GdkFont *gdk_font = GtkGetDefaultGuiFont();
-                GtkWidget *widget = gtk_button_new();
-                GtkStyle *def = gtk_rc_get_style( widget );
-                if (def)
-                    gdk_font =  def->font;
-                else
-                {
-                    def = gtk_widget_get_default_style();
-                    if (def)
-                        gdk_font =  def->font;
-                }
                 if (gdk_font)
                 {
                     GSList *font_list = ((GdkFontPrivate*)gdk_font)->names;

src/gtk/tbargtk.cpp

@@ -33,6 +33,8 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+extern GdkFont *GtkGetDefaultGuiFont();
+
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
@@ -303,9 +305,10 @@ bool wxToolBar::Create( wxWindow *parent,
                     GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) );
 
     g_style->bg[GTK_STATE_NORMAL] = *m_bg;
+    gdk_font_unref( g_style->font );
+	g_style->font = gdk_font_ref( GtkGetDefaultGuiFont() );
     gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
 
-
     m_parent->DoAddChild( this );
 
     PostCreation();

src/gtk/tooltip.cpp

@@ -21,6 +21,8 @@
 #include "gtk/gtk.h"
 #include "gdk/gdk.h"
 
+extern GdkFont *GtkGetDefaultGuiFont();
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
@@ -72,6 +74,8 @@ void wxToolTip::Apply( wxWindow *win )
 	    
         g_style->fg[GTK_STATE_NORMAL] = ss_fg;
         g_style->bg[GTK_STATE_NORMAL] = ss_bg;
+        gdk_font_unref( g_style->font );
+	    g_style->font = gdk_font_ref( GtkGetDefaultGuiFont() );
     
         gtk_widget_set_style( ss_tooltips->tip_window, g_style );
 #else

src/gtk1/font.cpp

@@ -397,7 +397,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
 
 static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
 
-static GdkFont *GtkGetDefaultGuiFont()
+GdkFont *GtkGetDefaultGuiFont()
 {
     if (!g_systemDefaultGuiFont)
     {

src/gtk1/settings.cpp

@@ -21,6 +21,8 @@
 #include <gdk/gdkprivate.h>
 #include <gtk/gtk.h>
 
+extern GdkFont *GtkGetDefaultGuiFont();
+
 
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0
@@ -234,17 +236,7 @@ wxFont wxSystemSettings::GetSystemFont( int index )
             if (!g_systemFont)
             {
 #if 0
-                GdkFont *gdk_font = (GdkFont*) NULL;
+                GdkFont *gdk_font = GtkGetDefaultGuiFont();
-                GtkWidget *widget = gtk_button_new();
-                GtkStyle *def = gtk_rc_get_style( widget );
-                if (def)
-                    gdk_font =  def->font;
-                else
-                {
-                    def = gtk_widget_get_default_style();
-                    if (def)
-                        gdk_font =  def->font;
-                }
                 if (gdk_font)
                 {
                     GSList *font_list = ((GdkFontPrivate*)gdk_font)->names;

src/gtk1/tbargtk.cpp

@@ -33,6 +33,8 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+extern GdkFont *GtkGetDefaultGuiFont();
+
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
@@ -303,9 +305,10 @@ bool wxToolBar::Create( wxWindow *parent,
                     GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) );
 
     g_style->bg[GTK_STATE_NORMAL] = *m_bg;
+    gdk_font_unref( g_style->font );
+	g_style->font = gdk_font_ref( GtkGetDefaultGuiFont() );
     gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
 
-
     m_parent->DoAddChild( this );
 
     PostCreation();

src/gtk1/tooltip.cpp

@@ -21,6 +21,8 @@
 #include "gtk/gtk.h"
 #include "gdk/gdk.h"
 
+extern GdkFont *GtkGetDefaultGuiFont();
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
@@ -72,6 +74,8 @@ void wxToolTip::Apply( wxWindow *win )
 	    
         g_style->fg[GTK_STATE_NORMAL] = ss_fg;
         g_style->bg[GTK_STATE_NORMAL] = ss_bg;
+        gdk_font_unref( g_style->font );
+	    g_style->font = gdk_font_ref( GtkGetDefaultGuiFont() );
     
         gtk_widget_set_style( ss_tooltips->tip_window, g_style );
 #else