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

Corrected GTK2 creation of default font.

Browse Source 
Removed ugly SET_STYLE_FONT code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-01-31 10:31:05 +00:00
parent a148cfb644
commit 288059b2b9
10 changed files with 20 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/choice.cpp
View File

@@ -474,7 +474,7 @@ wxSize wxChoice::DoGetBestSize() const
if ( ret.x < 80 ) if ( ret.x < 80 )
ret.x = 80; ret.x = 80;
ret.y = 16 + gdk_char_height(GET_STYLE_FONT( m_widget->style ), 'H' ); ret.y = 16 + GetCharHeight();
return ret; return ret;
} }

17
src/gtk/settings.cpp
View File

@@ -328,21 +328,8 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
if (!g_systemFont) if (!g_systemFont)
{ {
#ifdef __WXGTK20__ #ifdef __WXGTK20__
GtkWidget *widget = gtk_button_new(); const gchar *font_name = _gtk_rc_context_get_default_font_name (gtk_settings_get_default ());
GtkStyle *def = gtk_rc_get_style( widget ); g_systemFont = new wxFont( wxString::FromAscii( font_name ) );
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 #else
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
#endif #endif

4
src/gtk/tbargtk.cpp
View File

@@ -343,10 +343,6 @@ bool wxToolBar::Create( wxWindow *parent,
g_style->bg[GTK_STATE_NORMAL] = *m_bg; g_style->bg[GTK_STATE_NORMAL] = *m_bg;
#ifndef __WXGTK20__
SET_STYLE_FONT(g_style, GtkGetDefaultGuiFont());
#endif
gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style ); gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );

4
src/gtk/tooltip.cpp
View File

@@ -76,10 +76,6 @@ void wxToolTip::Apply( wxWindow *win )
g_style->fg[GTK_STATE_NORMAL] = ss_fg; g_style->fg[GTK_STATE_NORMAL] = ss_fg;
g_style->bg[GTK_STATE_NORMAL] = ss_bg; g_style->bg[GTK_STATE_NORMAL] = ss_bg;
#ifndef __WXGTK20__
SET_STYLE_FONT( g_style, GtkGetDefaultGuiFont() );
#endif
gtk_widget_set_style( ss_tooltips->tip_window, g_style ); gtk_widget_set_style( ss_tooltips->tip_window, g_style );
#else // GTK+ 1.0 #else // GTK+ 1.0
gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg ); gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );

10
src/gtk/window.cpp
View File

@@ -4145,12 +4145,16 @@ void wxWindowGTK::SetWidgetStyle()
GtkStyle *style = GetWidgetStyle(); GtkStyle *style = GetWidgetStyle();
#ifndef __WXGTK20__
if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT )) if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ))
{ {
SET_STYLE_FONT(style, m_font.GetInternalFont( 1.0 )); #ifdef __WXGTK20__
} pango_font_description_free( style->font_desc );
pango_font_description_copy( m_font.GetNativeFontInfo()->description );
#else
gdk_font_unref( style->font );
style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) )
#endif #endif
}
if (m_foregroundColour.Ok()) if (m_foregroundColour.Ok())
{ {

2
src/gtk1/choice.cpp
View File

@@ -474,7 +474,7 @@ wxSize wxChoice::DoGetBestSize() const
if ( ret.x < 80 ) if ( ret.x < 80 )
ret.x = 80; ret.x = 80;
ret.y = 16 + gdk_char_height(GET_STYLE_FONT( m_widget->style ), 'H' ); ret.y = 16 + GetCharHeight();
return ret; return ret;
} }

17
src/gtk1/settings.cpp
View File

@@ -328,21 +328,8 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
if (!g_systemFont) if (!g_systemFont)
{ {
#ifdef __WXGTK20__ #ifdef __WXGTK20__
GtkWidget *widget = gtk_button_new(); const gchar *font_name = _gtk_rc_context_get_default_font_name (gtk_settings_get_default ());
GtkStyle *def = gtk_rc_get_style( widget ); g_systemFont = new wxFont( wxString::FromAscii( font_name ) );
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 #else
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
#endif #endif

4
src/gtk1/tbargtk.cpp
View File

@@ -343,10 +343,6 @@ bool wxToolBar::Create( wxWindow *parent,
g_style->bg[GTK_STATE_NORMAL] = *m_bg; g_style->bg[GTK_STATE_NORMAL] = *m_bg;
#ifndef __WXGTK20__
SET_STYLE_FONT(g_style, GtkGetDefaultGuiFont());
#endif
gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style ); gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );

4
src/gtk1/tooltip.cpp
View File

@@ -76,10 +76,6 @@ void wxToolTip::Apply( wxWindow *win )
g_style->fg[GTK_STATE_NORMAL] = ss_fg; g_style->fg[GTK_STATE_NORMAL] = ss_fg;
g_style->bg[GTK_STATE_NORMAL] = ss_bg; g_style->bg[GTK_STATE_NORMAL] = ss_bg;
#ifndef __WXGTK20__
SET_STYLE_FONT( g_style, GtkGetDefaultGuiFont() );
#endif
gtk_widget_set_style( ss_tooltips->tip_window, g_style ); gtk_widget_set_style( ss_tooltips->tip_window, g_style );
#else // GTK+ 1.0 #else // GTK+ 1.0
gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg ); gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg );

10
src/gtk1/window.cpp
View File

@@ -4145,12 +4145,16 @@ void wxWindowGTK::SetWidgetStyle()
GtkStyle *style = GetWidgetStyle(); GtkStyle *style = GetWidgetStyle();
#ifndef __WXGTK20__
if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT )) if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ))
{ {
SET_STYLE_FONT(style, m_font.GetInternalFont( 1.0 )); #ifdef __WXGTK20__
} pango_font_description_free( style->font_desc );
pango_font_description_copy( m_font.GetNativeFontInfo()->description );
#else
gdk_font_unref( style->font );
style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) )
#endif #endif
}
if (m_foregroundColour.Ok()) if (m_foregroundColour.Ok())
{ {