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

fixed wxSYS_DEFAULT_GUI_FONT (I wonder how could it work for anybody before...)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-11-11 00:03:19 +00:00
parent 4a9150f9c8
commit 987b309827
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/settings.cpp
View File

@@ -16,6 +16,7 @@
#include "wx/debug.h" #include "wx/debug.h"
#include "wx/module.h" #include "wx/module.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"
#include "wx/fontutil.h"
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gdk/gdkprivate.h> #include <gdk/gdkprivate.h>
@@ -326,8 +327,25 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
{ {
if (!g_systemFont) if (!g_systemFont)
{ {
#ifdef __WXGTK20__
GtkWidget *widget = gtk_button_new();
GtkStyle *def = gtk_rc_get_style( widget );
if (!def)
def = gtk_widget_get_default_style();
if (def)
{
wxNativeFontInfo info;
info.description = def->font_desc;
g_systemFont = new wxFont(info);
}
else
{
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
}
gtk_widget_destroy( widget );
#else
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
#endif
} }
return *g_systemFont; return *g_systemFont;
} }

20
src/gtk1/settings.cpp
View File

@@ -16,6 +16,7 @@
#include "wx/debug.h" #include "wx/debug.h"
#include "wx/module.h" #include "wx/module.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"
#include "wx/fontutil.h"
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gdk/gdkprivate.h> #include <gdk/gdkprivate.h>
@@ -326,8 +327,25 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
{ {
if (!g_systemFont) if (!g_systemFont)
{ {
#ifdef __WXGTK20__
GtkWidget *widget = gtk_button_new();
GtkStyle *def = gtk_rc_get_style( widget );
if (!def)
def = gtk_widget_get_default_style();
if (def)
{
wxNativeFontInfo info;
info.description = def->font_desc;
g_systemFont = new wxFont(info);
}
else
{
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
}
gtk_widget_destroy( widget );
#else
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
#endif
} }
return *g_systemFont; return *g_systemFont;
} }