Use lib64 for 64-bit builds on some kinds of linux and lib/64 on solaris

[wxWidgets.git] / src / gtk / button.cpp

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index aec633f4503d231f87cf8a9f15f97e672098e0d4..faf3fa5d0f30be372b6332f84ba95ca573bf37da 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -47,6 +47,7 @@ extern bool   g_blockEventsOnDrag;
 // "clicked"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
     if (g_isIdle)
@@ -59,6 +60,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 +174,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);