Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tried to fix problem with wrong fonts in tool tips.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-05-01 19:04:30 +00:00
parent cd73d539f6
commit 076e41016d
8 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/font.cpp
View File

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

14
src/gtk/settings.cpp
View File

@@ -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;
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;
}
GdkFont *gdk_font = GtkGetDefaultGuiFont();
if (gdk_font)
{
GSList *font_list = ((GdkFontPrivate*)gdk_font)->names;

5
src/gtk/tbargtk.cpp
View File

@@ -33,6 +33,8 @@
#include "gdk/gdk.h"
#include "gtk/gtk.h"
extern GdkFont *GtkGetDefaultGuiFont();
// ----------------------------------------------------------------------------
// globals
// ----------------------------------------------------------------------------
@@ -303,8 +305,9 @@ 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 );

6
src/gtk/tooltip.cpp
View File

@@ -21,6 +21,8 @@
#include "gtk/gtk.h"
#include "gdk/gdk.h"
extern GdkFont *GtkGetDefaultGuiFont();
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
@@ -72,7 +74,9 @@ 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
gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );

2
src/gtk1/font.cpp
View File

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

14
src/gtk1/settings.cpp
View File

@@ -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;
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;
}
GdkFont *gdk_font = GtkGetDefaultGuiFont();
if (gdk_font)
{
GSList *font_list = ((GdkFontPrivate*)gdk_font)->names;

5
src/gtk1/tbargtk.cpp
View File

@@ -33,6 +33,8 @@
#include "gdk/gdk.h"
#include "gtk/gtk.h"
extern GdkFont *GtkGetDefaultGuiFont();
// ----------------------------------------------------------------------------
// globals
// ----------------------------------------------------------------------------
@@ -303,8 +305,9 @@ 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 );

6
src/gtk1/tooltip.cpp
View File

@@ -21,6 +21,8 @@
#include "gtk/gtk.h"
#include "gdk/gdk.h"
extern GdkFont *GtkGetDefaultGuiFont();
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
@@ -72,7 +74,9 @@ 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
gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );