X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff654490b7cb185631a1dc4621094d88643ccf41..4521f6c88cbefa7f13e3733d344776b795f981e4:/src/gtk/fontpicker.cpp diff --git a/src/gtk/fontpicker.cpp b/src/gtk/fontpicker.cpp index a0e12a4978..49e0710cff 100644 --- a/src/gtk/fontpicker.cpp +++ b/src/gtk/fontpicker.cpp @@ -4,7 +4,6 @@ // Author: Francesco Montorsi // Modified By: // Created: 15/04/2006 -// Id: $Id$ // Copyright: (c) Francesco Montorsi // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,7 +16,7 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_FONTPICKERCTRL +#if wxUSE_FONTPICKERCTRL #include "wx/fontpicker.h" @@ -42,7 +41,7 @@ static void gtk_fontbutton_setfont_callback(GtkFontButton *widget, // fire the colour-changed event wxFontPickerEvent event(p, p->GetId(), p->GetSelectedFont()); - p->GetEventHandler()->ProcessEvent(event); + p->HandleWindowEvent(event); } } @@ -66,6 +65,7 @@ bool wxFontButton::Create( wxWindow *parent, wxWindowID id, } m_widget = gtk_font_button_new(); + g_object_ref(m_widget); // set initial font m_selectedFont = initial.IsOk() ? initial : *wxNORMAL_FONT; @@ -80,8 +80,6 @@ bool wxFontButton::Create( wxWindow *parent, wxWindowID id, 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);