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

removed all compile- and run-time checks for GTK+ < 2.4; don't include the generic files which are now never used in wxGTK in the build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-05 22:31:24 +00:00
parent 899544330f
commit ff654490b7
41 changed files with 483 additions and 1234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/gtk/fontpicker.cpp
View File

@@ -50,7 +50,7 @@ static void gtk_fontbutton_setfont_callback(GtkFontButton *widget,
// wxFontButton
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxFontButton, wxGenericFontButton)
IMPLEMENT_DYNAMIC_CLASS(wxFontButton, wxButton)
bool wxFontButton::Create( wxWindow *parent, wxWindowID id,
const wxFont &initial,
@@ -58,45 +58,40 @@ bool wxFontButton::Create( wxWindow *parent, wxWindowID id,
long style, const wxValidator& validator,
const wxString &name )
{
if (!gtk_check_version(2,4,0))
if (!PreCreation( parent, pos, size ) ||
!wxControl::CreateBase(parent, id, pos, size, style, validator, name))
{
if (!PreCreation( parent, pos, size ) ||
!wxControl::CreateBase(parent, id, pos, size, style, validator, name))
{
wxFAIL_MSG( wxT("wxFontButton creation failed") );
return false;
}
m_widget = gtk_font_button_new();
// set initial font
m_selectedFont = initial.IsOk() ? initial : *wxNORMAL_FONT;
UpdateFont();
// honour the fontbutton styles
bool showall = (style & wxFNTP_FONTDESC_AS_LABEL) != 0,
usefont = (style & wxFNTP_USEFONT_FOR_LABEL) != 0;
gtk_font_button_set_show_style(GTK_FONT_BUTTON(m_widget), showall);
gtk_font_button_set_show_size(GTK_FONT_BUTTON(m_widget), showall);
gtk_font_button_set_use_size(GTK_FONT_BUTTON(m_widget), usefont);
gtk_font_button_set_use_font(GTK_FONT_BUTTON(m_widget), usefont);
gtk_widget_show(m_widget);
// GtkFontButton signals
g_signal_connect(m_widget, "font-set",
G_CALLBACK(gtk_fontbutton_setfont_callback), this);
m_parent->DoAddChild( this );
PostCreation(size);
SetInitialSize(size);
wxFAIL_MSG( wxT("wxFontButton creation failed") );
return false;
}
else
return wxGenericFontButton::Create(parent, id, initial, pos, size,
style, validator, name);
m_widget = gtk_font_button_new();
// set initial font
m_selectedFont = initial.IsOk() ? initial : *wxNORMAL_FONT;
UpdateFont();
// honour the fontbutton styles
bool showall = (style & wxFNTP_FONTDESC_AS_LABEL) != 0,
usefont = (style & wxFNTP_USEFONT_FOR_LABEL) != 0;
gtk_font_button_set_show_style(GTK_FONT_BUTTON(m_widget), showall);
gtk_font_button_set_show_size(GTK_FONT_BUTTON(m_widget), showall);
gtk_font_button_set_use_size(GTK_FONT_BUTTON(m_widget), usefont);
gtk_font_button_set_use_font(GTK_FONT_BUTTON(m_widget), usefont);
gtk_widget_show(m_widget);
// GtkFontButton signals
g_signal_connect(m_widget, "font-set",
G_CALLBACK(gtk_fontbutton_setfont_callback), this);
m_parent->DoAddChild( this );
PostCreation(size);
SetInitialSize(size);
return true;
}
@@ -106,16 +101,11 @@ wxFontButton::~wxFontButton()
void wxFontButton::UpdateFont()
{
if (!gtk_check_version(2,4,0))
{
const wxNativeFontInfo *info = m_selectedFont.GetNativeFontInfo();
wxASSERT_MSG( info, wxT("The fontbutton's internal font is not valid ?") );
const wxNativeFontInfo *info = m_selectedFont.GetNativeFontInfo();
wxASSERT_MSG( info, wxT("The fontbutton's internal font is not valid ?") );
const wxString& fontname = info->ToString();
gtk_font_button_set_font_name(GTK_FONT_BUTTON(m_widget), wxGTK_CONV(fontname));
}
else
wxGenericFontButton::UpdateFont();
const wxString& fontname = info->ToString();
gtk_font_button_set_font_name(GTK_FONT_BUTTON(m_widget), wxGTK_CONV(fontname));
}
#endif // wxUSE_FONTPICKERCTRL
#endif // wxUSE_FONTPICKERCTRL