GTK 1.2 compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 4e9908879bb0aac8a15ab9567b40bb37a0e5f56f..aa35b7af4b2c1d01d1b309d30ba9573cfb0ea664 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -230,8 +230,8 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
         GTK_SIGNAL_FUNC(gtk_dialog_focus_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
         GTK_SIGNAL_FUNC(gtk_dialog_focus_callback), (gpointer)this );
 

-    g_signal_connect (GTK_OBJECT(m_widget), "button_press_event",
-                   G_CALLBACK(gtk_popup_button_press), (gpointer)this );
+    gtk_signal_connect (GTK_OBJECT(m_widget), "button_press_event",
+        GTK_SIGNAL_FUNC(gtk_popup_button_press), (gpointer)this );

         
     return TRUE;
 }
         
     return TRUE;
 }

diff --git a/src/gtk1/popupwin.cpp b/src/gtk1/popupwin.cpp
index 4e9908879bb0aac8a15ab9567b40bb37a0e5f56f..aa35b7af4b2c1d01d1b309d30ba9573cfb0ea664 100644 (file)
--- a/src/gtk1/popupwin.cpp
+++ b/src/gtk1/popupwin.cpp
@@ -230,8 +230,8 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
         GTK_SIGNAL_FUNC(gtk_dialog_focus_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
         GTK_SIGNAL_FUNC(gtk_dialog_focus_callback), (gpointer)this );
 

-    g_signal_connect (GTK_OBJECT(m_widget), "button_press_event",
-                   G_CALLBACK(gtk_popup_button_press), (gpointer)this );
+    gtk_signal_connect (GTK_OBJECT(m_widget), "button_press_event",
+        GTK_SIGNAL_FUNC(gtk_popup_button_press), (gpointer)this );

         
     return TRUE;
 }
         
     return TRUE;
 }