Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2011-10-27 21:10:45 +00:00
parent 14c350dfc7
commit 1da8e6e400
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/gtk/window.h
View File

@@ -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 // This is just a wrapper for g_signal_connect() and returns the handler id
// just as it does. // 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 // Return true from here if PostCreation() should connect to size_request
// signal: this is done by default but doesn't work for some native // signal: this is done by default but doesn't work for some native

3
src/gtk/window.cpp
View File

@@ -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);
} }