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

Use g_signal* instead of deprecated gtk_signal*. Use proper casts for the arguments.

Browse Source 
Worth norting from the GTK+ docs: "For future usage, direct use of the GSignal API is recommended, this avoids
significant performance hits where GtkArg structures have to be converted into GValues."


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-01-22 23:28:58 +00:00
parent ce61519034
commit 9fa72bd2a6
32 changed files with 485 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gtk/slider.cpp
View File

@@ -202,14 +202,12 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
gtk_range_set_inverted( GTK_RANGE(m_widget), TRUE );
GtkEnableEvents();
gtk_signal_connect( GTK_OBJECT(m_widget),
"button_press_event",
(GtkSignalFunc)gtk_slider_button_press_callback,
(gpointer) this );
gtk_signal_connect( GTK_OBJECT(m_widget),
"button_release_event",
(GtkSignalFunc)gtk_slider_button_release_callback,
(gpointer) this );
g_signal_connect (m_widget, "button_press_event",
G_CALLBACK (gtk_slider_button_press_callback),
this);
g_signal_connect (m_widget, "button_release_event",
G_CALLBACK (gtk_slider_button_release_callback),
this);
SetRange( minValue, maxValue );
SetValue( value );
@@ -237,7 +235,7 @@ void wxSlider::SetValue( int value )
GtkDisableEvents();
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
g_signal_emit_by_name (m_adjust, "value_changed");
GtkEnableEvents();
}
@@ -260,7 +258,7 @@ void wxSlider::SetRange( int minValue, int maxValue )
GtkDisableEvents();
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
g_signal_emit_by_name (m_adjust, "changed");
GtkEnableEvents();
}
@@ -285,7 +283,7 @@ void wxSlider::SetPageSize( int pageSize )
GtkDisableEvents();
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
g_signal_emit_by_name (m_adjust, "changed");
GtkEnableEvents();
}
@@ -305,7 +303,7 @@ void wxSlider::SetThumbLength( int len )
GtkDisableEvents();
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
g_signal_emit_by_name (m_adjust, "changed");
GtkEnableEvents();
}
@@ -332,17 +330,15 @@ bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
void wxSlider::GtkDisableEvents()
{
gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
GTK_SIGNAL_FUNC(gtk_slider_callback),
(gpointer) this );
g_signal_handlers_disconnect_by_func (m_adjust,
(gpointer) gtk_slider_callback,
this);
}
void wxSlider::GtkEnableEvents()
{
gtk_signal_connect( GTK_OBJECT (m_adjust),
"value_changed",
GTK_SIGNAL_FUNC(gtk_slider_callback),
(gpointer) this );
g_signal_connect (m_adjust, "value_changed",
G_CALLBACK (gtk_slider_callback), this);
}
// static