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

fixed setting of initial font under wxGTK2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-12 12:36:26 +00:00
parent 81de4ba3ad
commit 2f35f36bbc
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/fontdlg.cpp
View File

@@ -152,7 +152,6 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
#ifndef __WXGTK20__
wxFont font = m_fontData.GetInitialFont(); wxFont font = m_fontData.GetInitialFont();
if( font.Ok() ) if( font.Ok() )
{ {
@@ -160,14 +159,15 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
if ( info ) if ( info )
{ {
#ifdef __WXGTK20__
const wxString& fontname = info->ToString();
#else
const wxString& fontname = info->GetXFontName(); const wxString& fontname = info->GetXFontName();
if ( !fontname ) if ( !fontname )
font.GetInternalFont(); font.GetInternalFont();
gtk_font_selection_dialog_set_font_name #endif
( gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname));
sel,
wxConvCurrent->cWX2MB(fontname)
);
} }
else else
{ {
@@ -175,7 +175,6 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
wxFAIL_MSG(_T("font is ok but no native font info?")); wxFAIL_MSG(_T("font is ok but no native font info?"));
} }
} }
#endif
return TRUE; return TRUE;
} }

13
src/gtk1/fontdlg.cpp
View File

@@ -152,7 +152,6 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
#ifndef __WXGTK20__
wxFont font = m_fontData.GetInitialFont(); wxFont font = m_fontData.GetInitialFont();
if( font.Ok() ) if( font.Ok() )
{ {
@@ -160,14 +159,15 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
if ( info ) if ( info )
{ {
#ifdef __WXGTK20__
const wxString& fontname = info->ToString();
#else
const wxString& fontname = info->GetXFontName(); const wxString& fontname = info->GetXFontName();
if ( !fontname ) if ( !fontname )
font.GetInternalFont(); font.GetInternalFont();
gtk_font_selection_dialog_set_font_name #endif
( gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname));
sel,
wxConvCurrent->cWX2MB(fontname)
);
} }
else else
{ {
@@ -175,7 +175,6 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
wxFAIL_MSG(_T("font is ok but no native font info?")); wxFAIL_MSG(_T("font is ok but no native font info?"));
} }
} }
#endif
return TRUE; return TRUE;
} }