Make GTK callbacks passed to GTKConnectWidget() extern "C".

This fixes (harmless but annoying) warnings about mixing C++ and C linkage
function pointers from Sun compiler.

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 5af2602f75db93a461812615d3c75d82769330f9..c8a7729c8e13effe8a053c2e3b7b60967c12b67b 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -18,6 +18,13 @@ struct wxGtkIMData;
 
 WX_DEFINE_EXPORTED_ARRAY_PTR(GdkWindow *, wxArrayGdkWindows);
 
 
 WX_DEFINE_EXPORTED_ARRAY_PTR(GdkWindow *, wxArrayGdkWindows);
 

+extern "C"
+{
+
+typedef void (*wxGTKCallback)();
+
+}
+

 //-----------------------------------------------------------------------------
 // wxWindowGTK
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxWindowGTK
 //-----------------------------------------------------------------------------


@@ -374,7 +381,7 @@ protected:
     //
     // This is just a wrapper for g_signal_connect() and returns the handler id
     // just as it does.
     //
     // This is just a wrapper for g_signal_connect() and returns the handler id
     // just as it does.

-    unsigned long GTKConnectWidget(const char *signal, void (*callback)());
+    unsigned long GTKConnectWidget(const char *signal, wxGTKCallback callback);

 
     // Return true from here if PostCreation() should connect to size_request
     // signal: this is done by default but doesn't work for some native
 
     // Return true from here if PostCreation() should connect to size_request
     // signal: this is done by default but doesn't work for some native

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 20ddddd5bb48c77bd3b93ba34faa493ade9bbafc..ec6db0f73aaa568befc7d0e5415eae253f151c26 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2444,7 +2444,8 @@ void wxWindowGTK::PostCreation()
         gtk_widget_show( m_widget );
 }
 
         gtk_widget_show( m_widget );
 }
 

-unsigned long wxWindowGTK::GTKConnectWidget(const char *signal, void (*callback)())
+unsigned long
+wxWindowGTK::GTKConnectWidget(const char *signal, wxGTKCallback callback)

 {
     return g_signal_connect(m_widget, signal, callback, this);
 }
 {
     return g_signal_connect(m_widget, signal, callback, this);
 }