X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f893066ba1d27683ba25e0f7841d18bb155acf8d..2e2a55b22eebde25797bd030660d8c644bc7700b:/src/gtk1/button.cpp diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index aec633f450..e6904b1c1a 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "button.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -47,6 +43,7 @@ extern bool g_blockEventsOnDrag; // "clicked" //----------------------------------------------------------------------------- +extern "C" { static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button ) { if (g_isIdle) @@ -59,6 +56,7 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton * event.SetEventObject(button); button->GetEventHandler()->ProcessEvent(event); } +} //----------------------------------------------------------------------------- // "style_set" from m_widget @@ -172,7 +170,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, else if (HasFlag(wxBU_BOTTOM)) y_alignment = 1.0; -#if __WXGTK24__ +#ifdef __WXGTK24__ if (!gtk_check_version(2,4,0)) { gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);