diff --git a/contrib/bkgrnd2d/dialog.cpp b/contrib/bkgrnd2d/dialog.cpp index ae6eef27..a8a3d79f 100644 --- a/contrib/bkgrnd2d/dialog.cpp +++ b/contrib/bkgrnd2d/dialog.cpp @@ -325,11 +325,11 @@ void InitBackgroundDialog(){ // GTK_STOCK_CLOSE, // GTK_RESPONSE_CLOSE, NULL ); - gtk_signal_connect( GTK_OBJECT( pDialogWnd ), "delete_event", + gtk_signal_connect( GTK_OBJECT( pDialogWnd ), "delete-event", GTK_SIGNAL_FUNC( close_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( pDialogWnd ), "response", GTK_SIGNAL_FUNC( response_callback ), NULL ); -// gtk_signal_connect( GTK_OBJECT (pDialogWnd), "expose_event", GTK_SIGNAL_FUNC( ci_expose ), NULL ); +// gtk_signal_connect( GTK_OBJECT (pDialogWnd), "expose-event", GTK_SIGNAL_FUNC( ci_expose ), NULL ); pTooltips = gtk_tooltips_new(); diff --git a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp index 768190ec..426bbb8b 100644 --- a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp +++ b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp @@ -207,7 +207,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ int mode = ( uType & MB_TYPEMASK ), ret, loop = 1; window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -321,7 +321,7 @@ int DoIntersectBox( IntersectRS* rs ){ window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_title( GTK_WINDOW( window ), "Intersect" ); @@ -417,7 +417,7 @@ int DoPolygonBox( PolygonRS* rs ){ window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_title( GTK_WINDOW( window ), "Polygon Builder" ); @@ -592,7 +592,7 @@ int DoBuildStairsBox( BuildStairsRS* rs ){ window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_title( GTK_WINDOW( window ), "Stair Builder" ); @@ -849,7 +849,7 @@ int DoDoorsBox( DoorRS* rs ){ window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_title( GTK_WINDOW( window ), "Door Builder" ); @@ -1063,7 +1063,7 @@ int DoPathPlotterBox( PathPlotterRS* rs ){ window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_title( GTK_WINDOW( window ), "Texture Reset" ); @@ -1233,7 +1233,7 @@ int DoCTFColourChangeBox(){ window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_title( GTK_WINDOW( window ), "CTF Colour Changer" ); @@ -1303,7 +1303,7 @@ int DoResetTextureBox( ResetTextureRS* rs ){ window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_title( GTK_WINDOW( window ), "Texture Reset" ); @@ -1640,7 +1640,7 @@ int DoTrainThingBox( TrainThingRS* rs ){ window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_title( GTK_WINDOW( window ), "Train Thing" ); diff --git a/contrib/camera/dialogs.cpp b/contrib/camera/dialogs.cpp index 7d75bf76..c8be4fff 100644 --- a/contrib/camera/dialogs.cpp +++ b/contrib/camera/dialogs.cpp @@ -73,7 +73,7 @@ static gint ci_new( GtkWidget *widget, gpointer data ){ // create the window window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( window ), "New Camera" ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pCameraInspectorWnd ) ); @@ -365,7 +365,7 @@ static gint ci_rename( GtkWidget *widget, gpointer data ){ // create the window window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( window ), "Rename Path" ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pCameraInspectorWnd ) ); @@ -483,7 +483,7 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ){ // create the window window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( window ), "Add Target" ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pCameraInspectorWnd ) ); @@ -830,7 +830,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ){ // create the window window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( window ), _( "Add Event" ) ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pCameraInspectorWnd ) ); @@ -996,8 +996,8 @@ GtkWidget *CreateCameraInspectorDialog( void ){ // create the window window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( window ), _( "Camera Inspector" ) ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( ci_close ), NULL ); - gtk_signal_connect( GTK_OBJECT( window ), "expose_event", GTK_SIGNAL_FUNC( ci_expose ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( ci_close ), NULL ); + gtk_signal_connect( GTK_OBJECT( window ), "expose-event", GTK_SIGNAL_FUNC( ci_expose ), NULL ); // gtk_signal_connect( GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pRadiantWnd ) ); @@ -1219,7 +1219,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){ gtk_widget_show( hbox ); g_pTimeLine = GTK_ADJUSTMENT( gtk_adjustment_new( 0, 0, 30000, 100, 250, 0 ) ); - gtk_signal_connect( GTK_OBJECT( g_pTimeLine ), "value_changed", GTK_SIGNAL_FUNC( ci_timeline_changed ), NULL ); + gtk_signal_connect( GTK_OBJECT( g_pTimeLine ), "value-changed", GTK_SIGNAL_FUNC( ci_timeline_changed ), NULL ); w = gtk_hscale_new( g_pTimeLine ); gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_widget_show( w ); diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp index b4151a24..526516cc 100644 --- a/contrib/gtkgensurf/gendlgs.cpp +++ b/contrib/gtkgensurf/gendlgs.cpp @@ -1361,7 +1361,7 @@ GtkWidget* create_main_dialog(){ g_pWnd = dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), gszCaption ); - g_signal_connect( G_OBJECT( dlg ), "delete_event", G_CALLBACK( main_close ), NULL ); + g_signal_connect( G_OBJECT( dlg ), "delete-event", G_CALLBACK( main_close ), NULL ); // g_signal_connect (G_OBJECT (dlg), "destroy", G_CALLBACK (gtk_widget_destroy), NULL); gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pRadiantWnd ) ); @@ -1373,7 +1373,7 @@ GtkWidget* create_main_dialog(){ notebook = gtk_notebook_new(); gtk_widget_show( notebook ); gtk_box_pack_start( GTK_BOX( hbox ), notebook, TRUE, TRUE, 0 ); - g_signal_connect( G_OBJECT( notebook ), "switch_page", + g_signal_connect( G_OBJECT( notebook ), "switch-page", G_CALLBACK( switch_page ), NULL ); gtk_notebook_set_tab_pos( GTK_NOTEBOOK( notebook ), GTK_POS_TOP ); g_object_set_data( G_OBJECT( dlg ), "notebook", notebook ); @@ -1498,7 +1498,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "wavelength", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &WaveLength ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &WaveLength ); entry = gtk_entry_new(); gtk_widget_show( entry ); @@ -1507,7 +1507,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "amplitude", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Amplitude ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &Amplitude ); entry = gtk_entry_new(); gtk_widget_show( entry ); @@ -1516,10 +1516,10 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "roughness", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Roughness ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &Roughness ); adj = gtk_adjustment_new( 1, 1, 32767, 1, 10, 0 ); - g_signal_connect( G_OBJECT( adj ), "value_changed", G_CALLBACK( general_random ), NULL ); + g_signal_connect( G_OBJECT( adj ), "value-changed", G_CALLBACK( general_random ), NULL ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); gtk_widget_show( spin ); gtk_table_attach( GTK_TABLE( table2 ), spin, 1, 2, 3, 4, @@ -1598,7 +1598,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "hmin", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Hll ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &Hll ); entry = gtk_entry_new(); gtk_widget_show( entry ); @@ -1607,7 +1607,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "hmax", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Hur ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &Hur ); entry = gtk_entry_new(); gtk_widget_show( entry ); @@ -1616,7 +1616,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "vmin", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Vll ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &Vll ); entry = gtk_entry_new(); gtk_widget_show( entry ); @@ -1625,7 +1625,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "vmax", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Vur ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &Vur ); frame = gtk_frame_new( _( "Divisions" ) ); gtk_widget_show( frame ); @@ -1653,7 +1653,7 @@ GtkWidget* create_main_dialog(){ g_object_set_data( G_OBJECT( dlg ), "nv_text", label ); adj = gtk_adjustment_new( 8, 1, MAX_ROWS, 1, 10, 0 ); - g_signal_connect( G_OBJECT( adj ), "value_changed", G_CALLBACK( extents_nhnv_spin ), &NH ); + g_signal_connect( G_OBJECT( adj ), "value-changed", G_CALLBACK( extents_nhnv_spin ), &NH ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); gtk_widget_show( spin ); gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 0, 1, @@ -1663,7 +1663,7 @@ GtkWidget* create_main_dialog(){ g_object_set_data( G_OBJECT( dlg ), "nh", spin ); adj = gtk_adjustment_new( 8, 1, MAX_ROWS, 1, 10, 0 ); - g_signal_connect( G_OBJECT( adj ), "value_changed", G_CALLBACK( extents_nhnv_spin ), &NV ); + g_signal_connect( G_OBJECT( adj ), "value-changed", G_CALLBACK( extents_nhnv_spin ), &NV ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); gtk_widget_show( spin ); gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 1, 2, @@ -1685,7 +1685,7 @@ GtkWidget* create_main_dialog(){ gtk_object_set_data( GTK_OBJECT( dlg ), "snap_text", label ); adj = gtk_adjustment_new( 8, 0, 256, 1, 10, 0 ); - g_signal_connect( G_OBJECT( adj ), "value_changed", G_CALLBACK( extents_snaptogrid_spin ), &SP ); + g_signal_connect( G_OBJECT( adj ), "value-changed", G_CALLBACK( extents_snaptogrid_spin ), &SP ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); gtk_widget_show( spin ); gtk_box_pack_start( GTK_BOX( vbox ), spin, FALSE, TRUE, 0 ); @@ -1702,7 +1702,7 @@ GtkWidget* create_main_dialog(){ gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, TRUE, 0 ); adj = gtk_adjustment_new( 0, 0, 110, 1, 10, 0 ); - g_signal_connect( G_OBJECT( adj ), "value_changed", G_CALLBACK( extents_decimate ), NULL ); + g_signal_connect( G_OBJECT( adj ), "value-changed", G_CALLBACK( extents_decimate ), NULL ); g_object_set_data( G_OBJECT( dlg ), "decimate_adj", adj ); scale = gtk_hscale_new( GTK_ADJUSTMENT( adj ) ); gtk_widget_show( scale ); @@ -1753,7 +1753,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "z01", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Z01 ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &Z01 ); entry = gtk_entry_new(); gtk_widget_show( entry ); @@ -1762,7 +1762,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "z00", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Z00 ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &Z00 ); entry = gtk_entry_new(); gtk_widget_show( entry ); @@ -1771,7 +1771,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "z11", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Z11 ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &Z11 ); entry = gtk_entry_new(); gtk_widget_show( entry ); @@ -1780,7 +1780,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "z10", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Z10 ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &Z10 ); check = gtk_check_button_new_with_label( "Linear borders" ); gtk_widget_show( check ); @@ -1823,7 +1823,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); g_object_set_data( G_OBJECT( dlg ), "bmp_file", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( bitmap_file_entryfocusout ), NULL ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( bitmap_file_entryfocusout ), NULL ); hbox2 = gtk_hbox_new( TRUE, 5 ); gtk_widget_show( hbox2 ); @@ -1881,7 +1881,7 @@ GtkWidget* create_main_dialog(){ gtk_box_pack_start( GTK_BOX( hbox2 ), entry, FALSE, FALSE, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "bmp_black", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &gbmp.black_value ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &gbmp.black_value ); hbox2 = gtk_hbox_new( FALSE, 5 ); gtk_widget_show( hbox2 ); @@ -1894,7 +1894,7 @@ GtkWidget* create_main_dialog(){ gtk_box_pack_start( GTK_BOX( hbox2 ), entry, FALSE, FALSE, 0 ); gtk_widget_set_usize( entry, 50, -2 ); g_object_set_data( G_OBJECT( dlg ), "bmp_white", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &gbmp.white_value ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( doublevariable_entryfocusout ), &gbmp.white_value ); vbox = gtk_vbox_new( FALSE, 10 ); gtk_widget_show( vbox ); @@ -1945,7 +1945,7 @@ GtkWidget* create_main_dialog(){ g_object_set_data( G_OBJECT( dlg ), "fix_rate_text", label ); adj = gtk_adjustment_new( 0, -65536, 65536, 1, 16, 0 ); - g_signal_connect( G_OBJECT( adj ), "value_changed", G_CALLBACK( fix_value_changed ), NULL ); + g_signal_connect( G_OBJECT( adj ), "value-changed", G_CALLBACK( fix_value_changed ), NULL ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); gtk_widget_show( spin ); gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 0, 1, @@ -1953,7 +1953,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_EXPAND ), 0, 0 ); gtk_widget_set_usize( spin, 60, -2 ); g_object_set_data( G_OBJECT( dlg ), "fix_value", spin ); - g_signal_connect( G_OBJECT( spin ), "focus_out_event", G_CALLBACK( fix_value_entryfocusout ), NULL ); + g_signal_connect( G_OBJECT( spin ), "focus-out-event", G_CALLBACK( fix_value_entryfocusout ), NULL ); entry = gtk_entry_new(); gtk_widget_show( entry ); @@ -1962,7 +1962,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 60, -2 ); g_object_set_data( G_OBJECT( dlg ), "fix_range", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( fix_range_entryfocusout ), NULL ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( fix_range_entryfocusout ), NULL ); entry = gtk_entry_new(); gtk_widget_show( entry ); @@ -1971,7 +1971,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 60, -2 ); g_object_set_data( G_OBJECT( dlg ), "fix_rate", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( fix_rate_entryfocusout ), NULL ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( fix_rate_entryfocusout ), NULL ); button = gtk_button_new_with_label( _( "Free" ) ); gtk_widget_show( button ); @@ -2034,7 +2034,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 60, -2 ); g_object_set_data( G_OBJECT( dlg ), "texture1", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( texture_entryfocusout ), GINT_TO_POINTER( 0 ) ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( texture_entryfocusout ), GINT_TO_POINTER( 0 ) ); entry = gtk_entry_new(); gtk_widget_show( entry ); @@ -2043,7 +2043,7 @@ GtkWidget* create_main_dialog(){ (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); gtk_widget_set_usize( entry, 60, -2 ); g_object_set_data( G_OBJECT( dlg ), "texture2", entry ); - g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( texture_entryfocusout ), GINT_TO_POINTER( 1 ) ); + g_signal_connect( G_OBJECT( entry ), "focus-out-event", G_CALLBACK( texture_entryfocusout ), GINT_TO_POINTER( 1 ) ); entry = gtk_entry_new(); gtk_widget_show( entry ); diff --git a/contrib/gtkgensurf/view.cpp b/contrib/gtkgensurf/view.cpp index c48f664a..30682948 100644 --- a/contrib/gtkgensurf/view.cpp +++ b/contrib/gtkgensurf/view.cpp @@ -373,7 +373,7 @@ void CreateViewWindow(){ g_pWndPreview = dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), "GtkGenSurf Preview" ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", GTK_SIGNAL_FUNC( preview_close ), NULL ); + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( preview_close ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pWnd ) ); gtk_window_set_default_size( GTK_WINDOW( dlg ), 300, 400 ); @@ -394,14 +394,14 @@ void CreateViewWindow(){ gtk_box_pack_start( GTK_BOX( hbox ), label, FALSE, TRUE, 0 ); adj = gtk_adjustment_new( 30, -90, 90, 1, 10, 0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( preview_spin ), &elevation ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( preview_spin ), &elevation ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); gtk_widget_show( spin ); gtk_box_pack_start( GTK_BOX( hbox ), spin, FALSE, TRUE, 0 ); - g_signal_connect( G_OBJECT( spin ), "focus_out_event", G_CALLBACK( doublevariable_spinfocusout ), &elevation ); + g_signal_connect( G_OBJECT( spin ), "focus-out-event", G_CALLBACK( doublevariable_spinfocusout ), &elevation ); adj = gtk_adjustment_new( 30, 0, 359, 1, 10, 0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( preview_spin ), &azimuth ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( preview_spin ), &azimuth ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); gtk_widget_show( spin ); gtk_spin_button_set_wrap( GTK_SPIN_BUTTON( spin ), TRUE ); @@ -411,7 +411,7 @@ void CreateViewWindow(){ gtk_widget_show( label ); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); gtk_box_pack_end( GTK_BOX( hbox ), label, FALSE, TRUE, 0 ); - g_signal_connect( G_OBJECT( spin ), "focus_out_event", G_CALLBACK( doublevariable_spinfocusout ), &azimuth ); + g_signal_connect( G_OBJECT( spin ), "focus-out-event", G_CALLBACK( doublevariable_spinfocusout ), &azimuth ); #endif frame = gtk_frame_new( NULL ); @@ -422,9 +422,9 @@ void CreateViewWindow(){ g_pPreviewWidget = g_UIGtkTable.m_pfn_glwidget_new( FALSE, NULL ); gtk_widget_set_events( g_pPreviewWidget, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK ); - gtk_signal_connect( GTK_OBJECT( g_pPreviewWidget ), "expose_event", GTK_SIGNAL_FUNC( expose ), NULL ); - gtk_signal_connect( GTK_OBJECT( g_pPreviewWidget ), "motion_notify_event", GTK_SIGNAL_FUNC( motion ), NULL ); - gtk_signal_connect( GTK_OBJECT( g_pPreviewWidget ), "button_press_event", + gtk_signal_connect( GTK_OBJECT( g_pPreviewWidget ), "expose-event", GTK_SIGNAL_FUNC( expose ), NULL ); + gtk_signal_connect( GTK_OBJECT( g_pPreviewWidget ), "motion-notify-event", GTK_SIGNAL_FUNC( motion ), NULL ); + gtk_signal_connect( GTK_OBJECT( g_pPreviewWidget ), "button-press-event", GTK_SIGNAL_FUNC( button_press ), NULL ); gtk_widget_show( g_pPreviewWidget ); diff --git a/contrib/prtview/AboutDialog.cpp b/contrib/prtview/AboutDialog.cpp index fcf30580..0fa05a67 100644 --- a/contrib/prtview/AboutDialog.cpp +++ b/contrib/prtview/AboutDialog.cpp @@ -59,7 +59,7 @@ void DoAboutDlg(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), "About Portal Viewer" ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); diff --git a/contrib/prtview/ConfigDialog.cpp b/contrib/prtview/ConfigDialog.cpp index 2f315190..43f20261 100644 --- a/contrib/prtview/ConfigDialog.cpp +++ b/contrib/prtview/ConfigDialog.cpp @@ -69,7 +69,7 @@ static int DoColor( COLORREF *c ){ dlg = gtk_color_selection_dialog_new( "Choose Color" ); gtk_color_selection_set_color( GTK_COLOR_SELECTION( GTK_COLOR_SELECTION_DIALOG( dlg )->colorsel ), clr ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -280,7 +280,7 @@ void DoConfigDialog(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Portal Viewer Configuration" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -314,7 +314,7 @@ void DoConfigDialog(){ lw3label = gtk_label_new( "" ); gtk_widget_show( lw3label ); gtk_box_pack_start( GTK_BOX( hbox ), lw3label, FALSE, TRUE, 0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScroll3d ), lw3label ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnScroll3d ), lw3label ); table = gtk_table_new( 2, 4, FALSE ); gtk_widget_show( table ); @@ -410,7 +410,7 @@ void DoConfigDialog(){ (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); gtk_misc_set_alignment( GTK_MISC( translabel ), 0.0, 0.0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScrollTrans ), translabel ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnScrollTrans ), translabel ); adj = gtk_adjustment_new( portals.clip_range, 1, 128, 1, 1, 1 ); clipslider = gtk_hscale_new( GTK_ADJUSTMENT( adj ) ); @@ -426,7 +426,7 @@ void DoConfigDialog(){ (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); gtk_misc_set_alignment( GTK_MISC( cliplabel ), 0.0, 0.0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScrollClip ), cliplabel ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnScrollClip ), cliplabel ); hbox = gtk_hbox_new( TRUE, 5 ); gtk_widget_show( hbox ); @@ -464,7 +464,7 @@ void DoConfigDialog(){ lw2label = gtk_label_new( "" ); gtk_widget_show( lw2label ); gtk_box_pack_start( GTK_BOX( hbox ), lw2label, FALSE, TRUE, 0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScroll2d ), lw2label ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnScroll2d ), lw2label ); hbox = gtk_hbox_new( FALSE, 5 ); gtk_widget_show( hbox ); diff --git a/contrib/prtview/LoadPortalFileDialog.cpp b/contrib/prtview/LoadPortalFileDialog.cpp index 4b25ce50..9586a247 100644 --- a/contrib/prtview/LoadPortalFileDialog.cpp +++ b/contrib/prtview/LoadPortalFileDialog.cpp @@ -75,7 +75,7 @@ static void change_clicked( GtkWidget *widget, gpointer data ){ GTK_SIGNAL_FUNC( file_sel_callback ), GINT_TO_POINTER( IDOK ) ); gtk_signal_connect( GTK_OBJECT( GTK_FILE_SELECTION( file_sel )->cancel_button ), "clicked", GTK_SIGNAL_FUNC( file_sel_callback ), GINT_TO_POINTER( IDCANCEL ) ); - gtk_signal_connect( GTK_OBJECT( file_sel ), "delete_event", + gtk_signal_connect( GTK_OBJECT( file_sel ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION( file_sel ) ); @@ -105,7 +105,7 @@ int DoLoadPortalFileDialog(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), "Load .prt" ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); diff --git a/contrib/prtview/gtkdlgs.cpp b/contrib/prtview/gtkdlgs.cpp index afe1615b..21c6f450 100644 --- a/contrib/prtview/gtkdlgs.cpp +++ b/contrib/prtview/gtkdlgs.cpp @@ -74,7 +74,7 @@ static void change_clicked( GtkWidget *widget, gpointer data ){ GTK_SIGNAL_FUNC( file_sel_callback ), GINT_TO_POINTER( IDOK ) ); gtk_signal_connect( GTK_OBJECT( GTK_FILE_SELECTION( file_sel )->cancel_button ), "clicked", GTK_SIGNAL_FUNC( file_sel_callback ), GINT_TO_POINTER( IDCANCEL ) ); - gtk_signal_connect( GTK_OBJECT( file_sel ), "delete_event", + gtk_signal_connect( GTK_OBJECT( file_sel ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION( file_sel ) ); @@ -107,7 +107,7 @@ int DoLoadPortalFileDialog(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), "Load .prt" ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -200,7 +200,7 @@ void DoAboutDlg(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), "About Portal Viewer" ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -254,7 +254,7 @@ static int DoColor( COLORREF *c ){ dlg = gtk_color_selection_dialog_new( "Choose Color" ); gtk_color_selection_set_color( GTK_COLOR_SELECTION( GTK_COLOR_SELECTION_DIALOG( dlg )->colorsel ), clr ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -465,7 +465,7 @@ void DoConfigDialog(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Portal Viewer Configuration" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -499,7 +499,7 @@ void DoConfigDialog(){ lw3label = gtk_label_new( "" ); gtk_widget_show( lw3label ); gtk_box_pack_start( GTK_BOX( hbox ), lw3label, FALSE, TRUE, 0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScroll3d ), lw3label ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnScroll3d ), lw3label ); table = gtk_table_new( 2, 4, FALSE ); gtk_widget_show( table ); @@ -595,7 +595,7 @@ void DoConfigDialog(){ (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); gtk_misc_set_alignment( GTK_MISC( translabel ), 0.0, 0.0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScrollTrans ), translabel ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnScrollTrans ), translabel ); adj = gtk_adjustment_new( portals.clip_range, 1, 128, 1, 1, 1 ); clipslider = gtk_hscale_new( GTK_ADJUSTMENT( adj ) ); @@ -611,7 +611,7 @@ void DoConfigDialog(){ (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); gtk_misc_set_alignment( GTK_MISC( cliplabel ), 0.0, 0.0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScrollClip ), cliplabel ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnScrollClip ), cliplabel ); hbox = gtk_hbox_new( TRUE, 5 ); gtk_widget_show( hbox ); @@ -649,7 +649,7 @@ void DoConfigDialog(){ lw2label = gtk_label_new( "" ); gtk_widget_show( lw2label ); gtk_box_pack_start( GTK_BOX( hbox ), lw2label, FALSE, TRUE, 0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScroll2d ), lw2label ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnScroll2d ), lw2label ); hbox = gtk_hbox_new( FALSE, 5 ); gtk_widget_show( hbox ); diff --git a/plugins/surface/surfacedialog.cpp b/plugins/surface/surfacedialog.cpp index 857db380..0b418263 100644 --- a/plugins/surface/surfacedialog.cpp +++ b/plugins/surface/surfacedialog.cpp @@ -95,7 +95,7 @@ texdef_t g_old_texdef; // when TRUE, this thing means the surface inspector is currently being displayed bool g_surfwin = FALSE; -// turn on/off processing of the "changed" "value_changed" messages +// turn on/off processing of the "changed" "value-changed" messages // (need to turn off when we are feeding data in) bool g_bListenChanged = true; // turn on/off listening of the update messages @@ -1140,7 +1140,7 @@ GtkWidget* create_SurfaceInspector( void ){ // closing the window (upper right window manager click) g_signal_connect( (gpointer) SurfaceInspector, - "delete_event", + "delete-event", G_CALLBACK( apply_and_hide ), NULL ); @@ -1148,11 +1148,11 @@ GtkWidget* create_SurfaceInspector( void ){ G_CALLBACK( gtk_widget_destroy ), NULL ); - g_signal_connect( (gpointer) texture_combo_entry, "key_press_event", + g_signal_connect( (gpointer) texture_combo_entry, "key-press-event", G_CALLBACK( on_texture_combo_entry_key_press_event ), NULL ); - g_signal_connect( (gpointer) SurfaceInspector, "key_press_event", + g_signal_connect( (gpointer) SurfaceInspector, "key-press-event", G_CALLBACK( surface_dialog_key_press ), NULL ); @@ -1160,35 +1160,35 @@ GtkWidget* create_SurfaceInspector( void ){ G_CALLBACK( on_texture_combo_entry_activate ), NULL ); - g_signal_connect( (gpointer) hshift_value_spinbutton, "value_changed", + g_signal_connect( (gpointer) hshift_value_spinbutton, "value-changed", G_CALLBACK( on_hshift_value_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) vshift_value_spinbutton, "value_changed", + g_signal_connect( (gpointer) vshift_value_spinbutton, "value-changed", G_CALLBACK( on_vshift_value_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) hscale_value_spinbutton, "value_changed", + g_signal_connect( (gpointer) hscale_value_spinbutton, "value-changed", G_CALLBACK( on_hscale_value_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) vscale_value_spinbutton, "value_changed", + g_signal_connect( (gpointer) vscale_value_spinbutton, "value-changed", G_CALLBACK( on_vscale_value_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) rotate_value_spinbutton, "value_changed", + g_signal_connect( (gpointer) rotate_value_spinbutton, "value-changed", G_CALLBACK( on_rotate_value_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) hshift_step_spinbutton, "value_changed", + g_signal_connect( (gpointer) hshift_step_spinbutton, "value-changed", G_CALLBACK( on_hshift_step_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) vshift_step_spinbutton, "value_changed", + g_signal_connect( (gpointer) vshift_step_spinbutton, "value-changed", G_CALLBACK( on_vshift_step_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) hscale_step_spinbutton, "value_changed", + g_signal_connect( (gpointer) hscale_step_spinbutton, "value-changed", G_CALLBACK( on_hscale_step_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) vscale_step_spinbutton, "value_changed", + g_signal_connect( (gpointer) vscale_step_spinbutton, "value-changed", G_CALLBACK( on_vscale_step_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) rotate_step_spinbutton, "value_changed", + g_signal_connect( (gpointer) rotate_step_spinbutton, "value-changed", G_CALLBACK( on_rotate_step_spinbutton_value_changed ), NULL ); @@ -1196,10 +1196,10 @@ GtkWidget* create_SurfaceInspector( void ){ G_CALLBACK( on_match_grid_button_clicked ), NULL ); - g_signal_connect( (gpointer) fit_width_spinbutton, "value_changed", + g_signal_connect( (gpointer) fit_width_spinbutton, "value-changed", G_CALLBACK( on_fit_width_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) fit_height_spinbutton, "value_changed", + g_signal_connect( (gpointer) fit_height_spinbutton, "value-changed", G_CALLBACK( on_fit_height_spinbutton_value_changed ), NULL ); g_signal_connect( (gpointer) fit_button, "clicked", diff --git a/plugins/surface_idtech2/surfacedialog.cpp b/plugins/surface_idtech2/surfacedialog.cpp index e2fa7a89..1d4a98f2 100644 --- a/plugins/surface_idtech2/surfacedialog.cpp +++ b/plugins/surface_idtech2/surfacedialog.cpp @@ -73,7 +73,7 @@ char old_texture_entry[128]; // when TRUE, this thing means the surface inspector is currently being displayed bool g_surfwin = FALSE; -// turn on/off processing of the "changed" "value_changed" messages +// turn on/off processing of the "changed" "value-changed" messages // (need to turn off when we are feeding data in) bool g_bListenChanged = TRUE; // turn on/off listening of the update messages @@ -789,52 +789,52 @@ GtkWidget* create_SurfaceInspector( void ){ create_SurfaceFlagsFrame( vbox1 ); g_signal_connect( (gpointer) SurfaceInspector, - "delete_event", + "delete-event", G_CALLBACK( delete_event_callback ), NULL ); g_signal_connect( (gpointer) SurfaceInspector, "destroy", G_CALLBACK( gtk_widget_destroy ), NULL ); - g_signal_connect( (gpointer) SurfaceInspector, "key_press_event", + g_signal_connect( (gpointer) SurfaceInspector, "key-press-event", G_CALLBACK( surface_inspector_key_press_event ), NULL ); - g_signal_connect( (gpointer) texture_combo_entry, "key_press_event", + g_signal_connect( (gpointer) texture_combo_entry, "key-press-event", G_CALLBACK( on_texture_combo_entry_key_press_event ), NULL ); g_signal_connect( (gpointer) texture_combo_entry, "activate", G_CALLBACK( on_texture_combo_entry_activate ), NULL ); - g_signal_connect( (gpointer) hshift_value_spinbutton, "value_changed", + g_signal_connect( (gpointer) hshift_value_spinbutton, "value-changed", G_CALLBACK( on_hshift_value_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) vshift_value_spinbutton, "value_changed", + g_signal_connect( (gpointer) vshift_value_spinbutton, "value-changed", G_CALLBACK( on_vshift_value_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) hscale_value_spinbutton, "value_changed", + g_signal_connect( (gpointer) hscale_value_spinbutton, "value-changed", G_CALLBACK( on_hscale_value_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) vscale_value_spinbutton, "value_changed", + g_signal_connect( (gpointer) vscale_value_spinbutton, "value-changed", G_CALLBACK( on_vscale_value_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) rotate_value_spinbutton, "value_changed", + g_signal_connect( (gpointer) rotate_value_spinbutton, "value-changed", G_CALLBACK( on_rotate_value_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) hshift_step_spinbutton, "value_changed", + g_signal_connect( (gpointer) hshift_step_spinbutton, "value-changed", G_CALLBACK( on_hshift_step_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) vshift_step_spinbutton, "value_changed", + g_signal_connect( (gpointer) vshift_step_spinbutton, "value-changed", G_CALLBACK( on_vshift_step_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) hscale_step_spinbutton, "value_changed", + g_signal_connect( (gpointer) hscale_step_spinbutton, "value-changed", G_CALLBACK( on_hscale_step_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) vscale_step_spinbutton, "value_changed", + g_signal_connect( (gpointer) vscale_step_spinbutton, "value-changed", G_CALLBACK( on_vscale_step_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) rotate_step_spinbutton, "value_changed", + g_signal_connect( (gpointer) rotate_step_spinbutton, "value-changed", G_CALLBACK( on_rotate_step_spinbutton_value_changed ), NULL ); @@ -842,10 +842,10 @@ GtkWidget* create_SurfaceInspector( void ){ G_CALLBACK( on_match_grid_button_clicked ), NULL ); - g_signal_connect( (gpointer) fit_width_spinbutton, "value_changed", + g_signal_connect( (gpointer) fit_width_spinbutton, "value-changed", G_CALLBACK( on_fit_width_spinbutton_value_changed ), NULL ); - g_signal_connect( (gpointer) fit_height_spinbutton, "value_changed", + g_signal_connect( (gpointer) fit_height_spinbutton, "value-changed", G_CALLBACK( on_fit_height_spinbutton_value_changed ), NULL ); g_signal_connect( (gpointer) fit_button, "clicked", diff --git a/plugins/surface_idtech2/surfaceflags.cpp b/plugins/surface_idtech2/surfaceflags.cpp index e8ec68cf..d8d7864c 100644 --- a/plugins/surface_idtech2/surfaceflags.cpp +++ b/plugins/surface_idtech2/surfaceflags.cpp @@ -272,7 +272,7 @@ void on_value_entry_insert_text( GtkEditable *editable, gchar *new_text, gint ne GTK_SIGNAL_FUNC( on_value_entry_insert_text ), user_data ); } - gtk_signal_emit_stop_by_name( GTK_OBJECT( editable ), "insert_text" ); + gtk_signal_emit_stop_by_name( GTK_OBJECT( editable ), "insert-text" ); g_free( result ); } @@ -365,7 +365,7 @@ GtkWidget* create_SurfaceFlagsFrame( GtkWidget* surfacedialog_widget ){ gtk_signal_connect( GTK_OBJECT( value_entry ), "changed", GTK_SIGNAL_FUNC( on_value_entry_changed ), NULL ); - gtk_signal_connect( GTK_OBJECT( value_entry ), "insert_text", + gtk_signal_connect( GTK_OBJECT( value_entry ), "insert-text", GTK_SIGNAL_FUNC( on_value_entry_insert_text ), NULL ); gtk_entry_set_max_length( (GtkEntry *)value_entry, 11 ); diff --git a/plugins/textool/TexTool.cpp b/plugins/textool/TexTool.cpp index ed478628..fa1edc5f 100644 --- a/plugins/textool/TexTool.cpp +++ b/plugins/textool/TexTool.cpp @@ -55,7 +55,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ int mode = ( uType & MB_TYPEMASK ), ret, loop = 1; window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -641,16 +641,16 @@ static GtkWidget* CreateOpenGLWidget(){ GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ); // Connect signal handlers - gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "expose_event", GTK_SIGNAL_FUNC( expose ), NULL ); - gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "motion_notify_event", + gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "expose-event", GTK_SIGNAL_FUNC( expose ), NULL ); + gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "motion-notify-event", GTK_SIGNAL_FUNC( motion ), NULL ); - gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "button_press_event", + gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "button-press-event", GTK_SIGNAL_FUNC( button_press ), NULL ); - gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "button_release_event", + gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "button-release-event", GTK_SIGNAL_FUNC( button_release ), NULL ); - gtk_signal_connect( GTK_OBJECT( g_pToolWnd ), "delete_event", GTK_SIGNAL_FUNC( close ), NULL ); - gtk_signal_connect( GTK_OBJECT( g_pToolWnd ), "key_press_event", + gtk_signal_connect( GTK_OBJECT( g_pToolWnd ), "delete-event", GTK_SIGNAL_FUNC( close ), NULL ); + gtk_signal_connect( GTK_OBJECT( g_pToolWnd ), "key-press-event", GTK_SIGNAL_FUNC( keypress ), NULL ); return g_pToolWidget; diff --git a/radiant/bp_dlg.cpp b/radiant/bp_dlg.cpp index 13ef1620..e7300802 100644 --- a/radiant/bp_dlg.cpp +++ b/radiant/bp_dlg.cpp @@ -59,7 +59,7 @@ int BP_MessageBox( int status ){ int ret, loop = 1; window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( BP_dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp index 87df69c1..b7cc9604 100644 --- a/radiant/camwindow.cpp +++ b/radiant/camwindow.cpp @@ -514,7 +514,7 @@ void CamWnd::ToggleFreeMove(){ // RR2DO2: FIXME why does this only work the 2nd and // further times the event is called? (floating windows // mode seems to work fine though...) - m_FocusOutHandler_id = gtk_signal_connect( GTK_OBJECT( widget ), "focus_out_event", + m_FocusOutHandler_id = gtk_signal_connect( GTK_OBJECT( widget ), "focus-out-event", GTK_SIGNAL_FUNC( camwindow_focusout ), g_pParentWnd ); { diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp index e95f5b67..70eb512d 100644 --- a/radiant/dialog.cpp +++ b/radiant/dialog.cpp @@ -81,7 +81,7 @@ static gint delete_event_callback( GtkWidget *widget, GdkEvent* event, gpointer void Dialog::Create(){ if ( m_bNeedBuild ) { m_pWidget = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( m_pWidget ), "delete_event", + gtk_signal_connect( GTK_OBJECT( m_pWidget ), "delete-event", GTK_SIGNAL_FUNC( delete_event_callback ), this ); gtk_signal_connect( GTK_OBJECT( m_pWidget ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); diff --git a/radiant/dialoginfo.cpp b/radiant/dialoginfo.cpp index c017cb0f..546815f0 100644 --- a/radiant/dialoginfo.cpp +++ b/radiant/dialoginfo.cpp @@ -41,7 +41,7 @@ void ShowInfoDialog( const char* pText ){ g_dlgInfo = dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), "Information" ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( gtk_widget_hide ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp index b09ce4a7..2145979f 100644 --- a/radiant/findtexturedialog.cpp +++ b/radiant/findtexturedialog.cpp @@ -146,7 +146,7 @@ void FindTextureDialog::BuildDialog(){ gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_signal_connect( GTK_OBJECT( entry ), "focus_in_event", + gtk_signal_connect( GTK_OBJECT( entry ), "focus-in-event", GTK_SIGNAL_FUNC( find_focus_in ), NULL ); AddDialogData( entry, &m_strFind, DLG_ENTRY_TEXT ); @@ -167,7 +167,7 @@ void FindTextureDialog::BuildDialog(){ gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - gtk_signal_connect( GTK_OBJECT( entry ), "focus_in_event", + gtk_signal_connect( GTK_OBJECT( entry ), "focus-in-event", GTK_SIGNAL_FUNC( replace_focus_in ), NULL ); AddDialogData( entry, &m_strReplace, DLG_ENTRY_TEXT ); diff --git a/radiant/glwindow.cpp b/radiant/glwindow.cpp index 92679836..3ad6a03b 100644 --- a/radiant/glwindow.cpp +++ b/radiant/glwindow.cpp @@ -215,13 +215,13 @@ GLWindow::GLWindow( bool zbuffer ) { // Connect signal handlers gtk_signal_connect( GTK_OBJECT( m_pWidget ), "realize", GTK_SIGNAL_FUNC( realize ), this ); - gtk_signal_connect( GTK_OBJECT( m_pWidget ), "expose_event", GTK_SIGNAL_FUNC( expose ), this ); - gtk_signal_connect( GTK_OBJECT( m_pWidget ), "motion_notify_event", GTK_SIGNAL_FUNC( motion ), this ); - gtk_signal_connect( GTK_OBJECT( m_pWidget ), "button_press_event", GTK_SIGNAL_FUNC( button_press ), this ); - gtk_signal_connect( GTK_OBJECT( m_pWidget ), "button_release_event",GTK_SIGNAL_FUNC( button_release ), this ); - gtk_signal_connect( GTK_OBJECT( m_pWidget ), "size_allocate", GTK_SIGNAL_FUNC( resize ), this ); + gtk_signal_connect( GTK_OBJECT( m_pWidget ), "expose-event", GTK_SIGNAL_FUNC( expose ), this ); + gtk_signal_connect( GTK_OBJECT( m_pWidget ), "motion-notify-event", GTK_SIGNAL_FUNC( motion ), this ); + gtk_signal_connect( GTK_OBJECT( m_pWidget ), "button-press-event", GTK_SIGNAL_FUNC( button_press ), this ); + gtk_signal_connect( GTK_OBJECT( m_pWidget ), "button-release-event",GTK_SIGNAL_FUNC( button_release ), this ); + gtk_signal_connect( GTK_OBJECT( m_pWidget ), "size-allocate", GTK_SIGNAL_FUNC( resize ), this ); #if GTK_CHECK_VERSION( 1,3,0 ) - gtk_signal_connect( GTK_OBJECT( m_pWidget ), "scroll_event", GTK_SIGNAL_FUNC( scroll_event ), this ); + gtk_signal_connect( GTK_OBJECT( m_pWidget ), "scroll-event", GTK_SIGNAL_FUNC( scroll_event ), this ); #endif } diff --git a/radiant/groupdialog.cpp b/radiant/groupdialog.cpp index e0f797f7..7816a910 100644 --- a/radiant/groupdialog.cpp +++ b/radiant/groupdialog.cpp @@ -1228,9 +1228,9 @@ void GroupDlg::Create(){ load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posEntityWnd ); gtk_window_set_title( GTK_WINDOW( dlg ), "Entities" ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", GTK_SIGNAL_FUNC( OnDeleteHide ), NULL ); + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( OnDeleteHide ), NULL ); // catch 'Esc' - gtk_signal_connect( GTK_OBJECT( dlg ), "key_press_event", GTK_SIGNAL_FUNC( OnDialogKey ), NULL ); + gtk_signal_connect( GTK_OBJECT( dlg ), "key-press-event", GTK_SIGNAL_FUNC( OnDialogKey ), NULL ); gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pParentWnd->m_pWidget ) ); g_qeglobals_gui.d_entity = dlg; @@ -1283,8 +1283,8 @@ void GroupDlg::Create(){ GtkWidget* view = gtk_tree_view_new_with_model( GTK_TREE_MODEL( store ) ); gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( view ), FALSE ); - g_signal_connect( G_OBJECT( view ), "button_press_event", G_CALLBACK( eclasslist_button_press ), NULL ); - g_signal_connect( G_OBJECT( view ), "key_press_event", G_CALLBACK( eclasslist_keypress ), this ); + g_signal_connect( G_OBJECT( view ), "button-press-event", G_CALLBACK( eclasslist_button_press ), NULL ); + g_signal_connect( G_OBJECT( view ), "key-press-event", G_CALLBACK( eclasslist_keypress ), this ); { GtkCellRenderer* renderer = gtk_cell_renderer_text_new(); @@ -1411,7 +1411,7 @@ void GroupDlg::Create(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); gtk_widget_set_events( entry, GDK_KEY_PRESS_MASK ); - gtk_signal_connect( GTK_OBJECT( entry ), "key_press_event", + gtk_signal_connect( GTK_OBJECT( entry ), "key-press-event", GTK_SIGNAL_FUNC( entityentry_keypress ), this ); EntWidgets[EntKeyField] = entry; } @@ -1423,7 +1423,7 @@ void GroupDlg::Create(){ (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); gtk_widget_set_events( entry, GDK_KEY_PRESS_MASK ); - gtk_signal_connect( GTK_OBJECT( entry ), "key_press_event", + gtk_signal_connect( GTK_OBJECT( entry ), "key-press-event", GTK_SIGNAL_FUNC( entityentry_keypress ), this ); EntWidgets[EntValueField] = entry; } @@ -1628,6 +1628,6 @@ void GroupDlg::Create(){ inspector_mode = W_ENTITY; m_pWidget = dlg; - g_signal_connect( G_OBJECT( notebook ), "switch_page", G_CALLBACK( switch_page ), dlg ); + g_signal_connect( G_OBJECT( notebook ), "switch-page", G_CALLBACK( switch_page ), dlg ); } } diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp index 44778059..501f108d 100644 --- a/radiant/gtkdlgs.cpp +++ b/radiant/gtkdlgs.cpp @@ -120,7 +120,7 @@ static void DoProjectAddEdit( bool edit, GtkWidget *parent ){ else{ gtk_window_set_title( GTK_WINDOW( dlg ), _( "Add Command" ) ); } - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -469,7 +469,7 @@ void DoProjectSettings(){ project = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( project ), _( "Project Settings" ) ); - gtk_signal_connect( GTK_OBJECT( project ), "delete_event", + gtk_signal_connect( GTK_OBJECT( project ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( project ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -1232,7 +1232,7 @@ void DoMapInfo(){ load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posMapInfoWnd ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Map Info" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -1494,7 +1494,7 @@ void DoEntityList(){ load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posEntityInfoWnd ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Entities" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -1516,7 +1516,7 @@ void DoEntityList(){ GtkTreeStore* store = gtk_tree_store_new( 2, G_TYPE_STRING, G_TYPE_POINTER ); GtkWidget* view = gtk_tree_view_new_with_model( GTK_TREE_MODEL( store ) ); - g_signal_connect( G_OBJECT( view ), "button_press_event", G_CALLBACK( entitylist_click ), dlg ); + g_signal_connect( G_OBJECT( view ), "button-press-event", G_CALLBACK( entitylist_click ), dlg ); gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( view ), FALSE ); { @@ -1695,7 +1695,7 @@ void DoRotateDlg(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Arbitrary rotation" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -1806,7 +1806,7 @@ void DoGamma(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Gamma" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -2017,7 +2017,7 @@ void DoFind(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Find Brush" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -2111,7 +2111,7 @@ void DoSides( bool bCone, bool bSphere, bool bTorus ){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Arbitrary sides" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -2183,7 +2183,7 @@ void DoNewPatchDlg(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Patch density" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -2291,7 +2291,7 @@ void DoScaleDlg(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Scale" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -2406,7 +2406,7 @@ void DoThickenDlg(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Thicken Patch" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -2524,7 +2524,7 @@ void DoAbout(){ gtk_window_set_position( GTK_WINDOW( dlg ), GTK_WIN_POS_CENTER_ON_PARENT ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "About GtkRadiant" ) ); gtk_window_set_resizable( GTK_WINDOW( dlg ), FALSE ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -2692,7 +2692,7 @@ void DoCommandListDlg(){ gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pParentWnd->m_pWidget ) ); gtk_window_set_position( GTK_WINDOW( dlg ), GTK_WIN_POS_CENTER_ON_PARENT ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Shortcut List" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -2831,7 +2831,7 @@ void DoTextureListDlg(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Textures" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -2941,7 +2941,7 @@ int DoCapDlg( int *type, bool *b_GroupResult ){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Cap" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -3084,7 +3084,7 @@ void DoScriptsDlg(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Available Scripts - Not Implemented Yet" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -3231,7 +3231,7 @@ int DoBSInputDlg( const char *fields[5], float values[5] ){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "BrushScript Input" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -3318,7 +3318,7 @@ int DoTextureLayout( float *fx, float *fy ){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Patch texture layout" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -3423,7 +3423,7 @@ char* DoNameDlg( const char* title ){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), title ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -3501,7 +3501,7 @@ char* DoNewProjectDlg(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "New Project" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -3685,7 +3685,7 @@ static void CreateGtkTextEditor(){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( editor_delete ), NULL ); gtk_window_set_default_size( GTK_WINDOW( dlg ), 600, 300 ); @@ -3899,7 +3899,7 @@ int DoLightIntensityDlg( int *intensity ){ dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Light intensity" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); diff --git a/radiant/gtkfilesel-darwin.c b/radiant/gtkfilesel-darwin.c index 3b588660..7577a389 100644 --- a/radiant/gtkfilesel-darwin.c +++ b/radiant/gtkfilesel-darwin.c @@ -758,9 +758,9 @@ gtk_file_selection_init( GtkFileSelection *filesel ){ gtk_widget_show( label ); filesel->selection_entry = gtk_entry_new(); - gtk_signal_connect( GTK_OBJECT( filesel->selection_entry ), "key_press_event", + gtk_signal_connect( GTK_OBJECT( filesel->selection_entry ), "key-press-event", (GtkSignalFunc) gtk_file_selection_key_press, filesel ); - gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "focus_in_event", + gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "focus-in-event", (GtkSignalFunc) gtk_widget_grab_default, GTK_OBJECT( filesel->ok_button ) ); gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "activate", @@ -1396,7 +1396,7 @@ gtk_file_selection_key_press( GtkWidget *widget, g_free( text ); - gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key_press_event" ); + gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key-press-event" ); return TRUE; } @@ -1606,7 +1606,7 @@ gtk_file_selection_history_combo_callback( GtkWidget *widget, GdkEventKey *event strcat( path,"/" ); gtk_file_selection_populate( fs,path,TRUE ); g_free( path ); - gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key_press_event" ); + gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key-press-event" ); return TRUE; } else diff --git a/radiant/gtkfilesel-linux.c b/radiant/gtkfilesel-linux.c index da5cbea2..51481100 100644 --- a/radiant/gtkfilesel-linux.c +++ b/radiant/gtkfilesel-linux.c @@ -1362,7 +1362,7 @@ gtk_file_selection_init( GtkFileSelection *filesel ){ gtk_signal_connect( GTK_OBJECT( filesel->dir_list ), "unselect_row", (GtkSignalFunc) gtk_file_selection_undir_button, (gpointer) filesel ); - gtk_signal_connect( GTK_OBJECT( filesel->dir_list ), "button_press_event", + gtk_signal_connect( GTK_OBJECT( filesel->dir_list ), "button-press-event", GTK_SIGNAL_FUNC( gtk_file_selection_show_fileop_menu ), (gpointer) filesel ); @@ -1432,7 +1432,7 @@ gtk_file_selection_init( GtkFileSelection *filesel ){ (GtkSignalFunc) gtk_file_selection_files_list_key_callback, (gpointer) filesel ); - gtk_signal_connect( GTK_OBJECT( filesel->file_list ), "button_press_event", + gtk_signal_connect( GTK_OBJECT( filesel->file_list ), "button-press-event", GTK_SIGNAL_FUNC( gtk_file_selection_show_fileop_menu ), (gpointer) filesel ); @@ -1479,7 +1479,7 @@ gtk_file_selection_init( GtkFileSelection *filesel ){ filesel->selection_entry = gtk_entry_new(); - gtk_signal_connect( GTK_OBJECT( filesel->selection_entry ), "key_press_event", + gtk_signal_connect( GTK_OBJECT( filesel->selection_entry ), "key-press-event", (GtkSignalFunc) gtk_file_selection_key_press, filesel ); gtk_table_attach( GTK_TABLE( table ), filesel->selection_entry, 1, 2, 0, 1, (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), @@ -1527,7 +1527,7 @@ gtk_file_selection_init( GtkFileSelection *filesel ){ filesel->ok_button = gtk_button_new_with_label( _( "OK" ) ); GTK_WIDGET_SET_FLAGS( filesel->ok_button, GTK_CAN_DEFAULT ); gtk_box_pack_start( GTK_BOX( confirm_area ), filesel->ok_button, TRUE, TRUE, 0 ); - gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "focus_in_event", + gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "focus-in-event", (GtkSignalFunc) gtk_widget_grab_default, GTK_OBJECT( filesel->ok_button ) ); gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "activate", @@ -2854,7 +2854,7 @@ gtk_file_selection_key_press( GtkWidget *widget, g_free( text ); - gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key_press_event" ); + gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key-press-event" ); return TRUE; } @@ -3064,7 +3064,7 @@ static gint gtk_file_selection_files_list_key_callback( GtkWidget *widget, GdkEv g_print( "complete: %s\n",fs->saved_entry1 ); /* gtk_label_set_text(GTK_LABEL(fs->completion_label),fs->saved_entry1);*/ - gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key_press_event" ); + gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key-press-event" ); } else { if ( fs->saved_entry1 ) { @@ -3095,7 +3095,7 @@ static gint gtk_file_selection_mask_entry_key_callback( GtkWidget *widget, GdkEv gtk_file_selection_refresh_button( widget,fs ); if ( event->keyval == GDK_Return ) { - gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key_press_event" ); + gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key-press-event" ); } return TRUE; } @@ -3181,7 +3181,7 @@ gtk_file_selection_history_combo_callback( GtkWidget *widget, GdkEventKey *event strcat( path,"/" ); gtk_file_selection_populate( fs,path,TRUE ); g_free( path ); - gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key_press_event" ); + gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key-press-event" ); return TRUE; } else diff --git a/radiant/gtkfilesel.c b/radiant/gtkfilesel.c index a75a95b6..06a79f7b 100644 --- a/radiant/gtkfilesel.c +++ b/radiant/gtkfilesel.c @@ -737,9 +737,9 @@ gtk_file_selection_init( GtkFileSelection *filesel ){ gtk_widget_show( label ); filesel->selection_entry = gtk_entry_new(); - gtk_signal_connect( GTK_OBJECT( filesel->selection_entry ), "key_press_event", + gtk_signal_connect( GTK_OBJECT( filesel->selection_entry ), "key-press-event", (GtkSignalFunc) gtk_file_selection_key_press, filesel ); - gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "focus_in_event", + gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "focus-in-event", (GtkSignalFunc) gtk_widget_grab_default, GTK_OBJECT( filesel->ok_button ) ); gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "activate", @@ -1375,7 +1375,7 @@ gtk_file_selection_key_press( GtkWidget *widget, g_free( text ); - gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key_press_event" ); + gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key-press-event" ); return TRUE; } @@ -1585,7 +1585,7 @@ gtk_file_selection_history_combo_callback( GtkWidget *widget, GdkEventKey *event strcat( path,"/" ); gtk_file_selection_populate( fs,path,TRUE ); g_free( path ); - gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key_press_event" ); + gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key-press-event" ); return TRUE; } else diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp index 215fcd96..53b97f6f 100644 --- a/radiant/gtkmisc.cpp +++ b/radiant/gtkmisc.cpp @@ -889,7 +889,7 @@ int WINAPI gtk_MessageBoxNew( void *parent, const char *message, // create dialog window GtkWidget *dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -1046,7 +1046,7 @@ int WINAPI gtk_MessageBox( void *parent, const char* lpText, const char* lpCapti int mode = ( uType & MB_TYPEMASK ), ret, loop = 1; window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); @@ -1668,7 +1668,7 @@ bool WINAPI color_dialog( void *parent, float *color, const char* title ){ dlg = gtk_color_selection_dialog_new( title ); gtk_color_selection_set_color( GTK_COLOR_SELECTION( GTK_COLOR_SELECTION_DIALOG( dlg )->colorsel ), clr ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL ); gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 9dcaced5..6087570c 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -806,7 +806,7 @@ static gint mainframe_keypress( GtkWidget* widget, GdkEventKey* event, gpointer } if ( ( g_Commands[i].m_nModifiers & 0x7 ) == nState ) { HandleCommand( NULL, GINT_TO_POINTER( g_Commands[i].m_nCommand ) ); - gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key_press_event" ); + gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key-press-event" ); return FALSE; } } @@ -837,7 +837,7 @@ static gint mainframe_keyrelease( GtkWidget* widget, GdkEventKey* event, gpointe case ID_CAMERA_STRAFERIGHT: { HandleKeyUp( NULL, GINT_TO_POINTER( g_Commands[i].m_nCommand ) ); - gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key_release_event" ); + gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key-release-event" ); } } @@ -2060,13 +2060,13 @@ static GtkWidget* create_floating( MainFrame* mainframe ){ if (mainframe->CurrentStyle() != MainFrame::eFloating) gtk_window_set_transient_for( GTK_WINDOW( wnd ), GTK_WINDOW( mainframe->m_pWidget ) ); gtk_widget_set_events( wnd, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK ); - gtk_signal_connect( GTK_OBJECT( wnd ), "delete_event", GTK_SIGNAL_FUNC( widget_delete_hide ), NULL ); + gtk_signal_connect( GTK_OBJECT( wnd ), "delete-event", GTK_SIGNAL_FUNC( widget_delete_hide ), NULL ); gtk_signal_connect( GTK_OBJECT( wnd ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); - gtk_signal_connect( GTK_OBJECT( wnd ), "key_press_event", + gtk_signal_connect( GTK_OBJECT( wnd ), "key-press-event", GTK_SIGNAL_FUNC( mainframe_keypress ), mainframe ); - gtk_signal_connect( GTK_OBJECT( wnd ), "key_release_event", + gtk_signal_connect( GTK_OBJECT( wnd ), "key-release-event", GTK_SIGNAL_FUNC( mainframe_keyrelease ), mainframe ); - gtk_signal_connect( GTK_OBJECT( wnd ), "map_event", + gtk_signal_connect( GTK_OBJECT( wnd ), "map-event", GTK_SIGNAL_FUNC( mainframe_map ), mainframe ); gtk_window_set_default_size( GTK_WINDOW( wnd ), 100, 100 ); @@ -2370,8 +2370,8 @@ GtkWidget* create_framed_texwnd( TexWnd* texwnd ){ w = gtk_entry_new(); gtk_box_pack_start( GTK_BOX( texbox ), w, FALSE, FALSE, 0 ); texwnd->m_pFilter = w; - g_signal_connect( G_OBJECT( w ), "focus_in_event", G_CALLBACK( entry_focus_in ), NULL ); - g_signal_connect( G_OBJECT( w ), "focus_out_event", G_CALLBACK( entry_focus_out ), NULL ); + g_signal_connect( G_OBJECT( w ), "focus-in-event", G_CALLBACK( entry_focus_in ), NULL ); + g_signal_connect( G_OBJECT( w ), "focus-out-event", G_CALLBACK( entry_focus_out ), NULL ); w = texwnd->GetWidget(); gtk_box_pack_start( GTK_BOX( texbox ), w, TRUE, TRUE, 0 ); @@ -2429,17 +2429,17 @@ void MainFrame::Create(){ GtkWidget* window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); m_pWidget = window; gtk_widget_set_events( window, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK ); - gtk_signal_connect( GTK_OBJECT( window ), "delete_event", + gtk_signal_connect( GTK_OBJECT( window ), "delete-event", GTK_SIGNAL_FUNC( mainframe_delete ), this ); gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( mainframe_destroy ), this ); - gtk_signal_connect( GTK_OBJECT( window ), "key_press_event", + gtk_signal_connect( GTK_OBJECT( window ), "key-press-event", GTK_SIGNAL_FUNC( mainframe_keypress ), this ); - gtk_signal_connect( GTK_OBJECT( window ), "key_release_event", + gtk_signal_connect( GTK_OBJECT( window ), "key-release-event", GTK_SIGNAL_FUNC( mainframe_keyrelease ), this ); - gtk_signal_connect( GTK_OBJECT( window ), "map_event", + gtk_signal_connect( GTK_OBJECT( window ), "map-event", GTK_SIGNAL_FUNC( mainframe_map ), this ); - gtk_signal_connect( GTK_OBJECT( window ), "unmap_event", + gtk_signal_connect( GTK_OBJECT( window ), "unmap-event", GTK_SIGNAL_FUNC( mainframe_unmap ), this ); g_qeglobals_gui.d_main_window = window; diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp index 7707afbb..044c7484 100644 --- a/radiant/patchdialog.cpp +++ b/radiant/patchdialog.cpp @@ -298,9 +298,9 @@ void PatchDialog::BuildDialog(){ load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posPatchWnd ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Patch Properties" ) ); - gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", GTK_SIGNAL_FUNC( OnDone ), NULL ); + gtk_signal_connect( GTK_OBJECT( dlg ), "delete-event", GTK_SIGNAL_FUNC( OnDone ), NULL ); // catch 'Esc' and 'Enter' - gtk_signal_connect( GTK_OBJECT( dlg ), "key_press_event", GTK_SIGNAL_FUNC( OnDialogKey ), NULL ); + gtk_signal_connect( GTK_OBJECT( dlg ), "key-press-event", GTK_SIGNAL_FUNC( OnDialogKey ), NULL ); gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pParentWnd->m_pWidget ) ); @@ -510,7 +510,7 @@ void PatchDialog::BuildDialog(){ gtk_entry_set_text( GTK_ENTRY( entry ), buf ); adj = gtk_adjustment_new( 0, -8192, 8192, 1, 1, 0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnSpinChanged ), entry ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnSpinChanged ), entry ); g_object_set_data( G_OBJECT( m_pWidget ), "hshift_adj", adj ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); @@ -530,7 +530,7 @@ void PatchDialog::BuildDialog(){ gtk_entry_set_text( GTK_ENTRY( entry ), buf ); adj = gtk_adjustment_new( 0, -8192, 8192, 1, 1, 0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnSpinChanged ), entry ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnSpinChanged ), entry ); g_object_set_data( G_OBJECT( m_pWidget ), "vshift_adj", adj ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); @@ -550,7 +550,7 @@ void PatchDialog::BuildDialog(){ gtk_entry_set_text( GTK_ENTRY( entry ), buf ); adj = gtk_adjustment_new( 0, -1000, 1000, 1, 1, 0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnSpinChanged ), entry ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnSpinChanged ), entry ); g_object_set_data( G_OBJECT( m_pWidget ), "hscale_adj", adj ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); @@ -570,7 +570,7 @@ void PatchDialog::BuildDialog(){ gtk_entry_set_text( GTK_ENTRY( entry ), buf ); adj = gtk_adjustment_new( 0, -1000, 1000, 1, 1, 0 ); - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnSpinChanged ), entry ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnSpinChanged ), entry ); g_object_set_data( G_OBJECT( m_pWidget ), "vscale_adj", adj ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); @@ -590,7 +590,7 @@ void PatchDialog::BuildDialog(){ gtk_entry_set_text( GTK_ENTRY( entry ), buf ); adj = gtk_adjustment_new( 0, -1000, 1000, 1, 1, 0 ); // NOTE: Arnout - this really should be 360 but can't change it anymore as it could break existing maps - gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnSpinChanged ), entry ); + gtk_signal_connect( adj, "value-changed", GTK_SIGNAL_FUNC( OnSpinChanged ), entry ); g_object_set_data( G_OBJECT( m_pWidget ), "rotate_adj", adj ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); diff --git a/radiant/patchdialog.h b/radiant/patchdialog.h index feb70f81..575da7f6 100644 --- a/radiant/patchdialog.h +++ b/radiant/patchdialog.h @@ -69,7 +69,7 @@ GtkWidget *GetWidget() { return m_pWidget; } // 0 is invalid, otherwise it's the Id of the last 'do' we are responsible for // int m_nUndoId; -// turn on/off processing of the "changed" "value_changed" messages +// turn on/off processing of the "changed" "value-changed" messages // (need to turn off when we are feeding data in) // NOTE: much more simple than blocking signals bool m_bListenChanged; diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp index 08f106fe..b6ec0726 100644 --- a/radiant/surfacedialog.cpp +++ b/radiant/surfacedialog.cpp @@ -51,7 +51,7 @@ texdef_t g_old_texdef; // when != NULL, this thing means the surface inspector is currently being displayed // NOTE a boolean flag would have been more explicit, this is totally so ugly GtkWidget* g_surfwin = NULL; -// turn on/off processing of the "changed" "value_changed" messages +// turn on/off processing of the "changed" "value-changed" messages // (need to turn off when we are feeding data in) bool g_bListenChanged = true; // the struct used to store the increments (saved in registry) @@ -509,9 +509,9 @@ void SurfaceDlg::BuildDialog() { load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posSurfaceWnd ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "Surface inspector" ) ); - //g_signal_connect (G_OBJECT (dlg), "delete_event", G_CALLBACK (OnCancel), NULL); + //g_signal_connect (G_OBJECT (dlg), "delete-event", G_CALLBACK (OnCancel), NULL); // we catch 'Enter' and interpret is as OnDone - gtk_signal_connect( GTK_OBJECT( dlg ), "key_press_event", GTK_SIGNAL_FUNC( OnDialogKey ), NULL ); + gtk_signal_connect( GTK_OBJECT( dlg ), "key-press-event", GTK_SIGNAL_FUNC( OnDialogKey ), NULL ); gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pParentWnd->m_pWidget ) ); // replaced by only the vbox: @@ -529,7 +529,7 @@ void SurfaceDlg::BuildDialog() { gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, TRUE, 0 ); entry = gtk_entry_new(); - gtk_signal_connect( GTK_OBJECT( entry ), "key_press_event", GTK_SIGNAL_FUNC( OnTextureKey ), NULL ); + gtk_signal_connect( GTK_OBJECT( entry ), "key-press-event", GTK_SIGNAL_FUNC( OnTextureKey ), NULL ); gtk_widget_show( entry ); gtk_box_pack_start( GTK_BOX( hbox2 ), entry, TRUE, TRUE, 0 ); g_object_set_data( G_OBJECT( m_pWidget ), "texture", entry ); @@ -550,7 +550,7 @@ void SurfaceDlg::BuildDialog() { spin = gtk_spin_button_new( GTK_ADJUSTMENT( gtk_adjustment_new( 0, -8192, 8192, 2, 8, 0 ) ), 0, 0 ); g_object_set_data( G_OBJECT( dlg ), "hshift", spin ); - gtk_signal_connect( GTK_OBJECT( gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON( spin ) ) ), "value_changed", + gtk_signal_connect( GTK_OBJECT( gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON( spin ) ) ), "value-changed", GTK_SIGNAL_FUNC( OnUpdate ), NULL ); gtk_widget_show( spin ); gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 0, 1, @@ -584,7 +584,7 @@ void SurfaceDlg::BuildDialog() { spin = gtk_spin_button_new( GTK_ADJUSTMENT( gtk_adjustment_new( 0, -8192, 8192, 2, 8, 0 ) ), 0, 0 ); g_object_set_data( G_OBJECT( dlg ), "vshift", spin ); - gtk_signal_connect( GTK_OBJECT( gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON( spin ) ) ), "value_changed", + gtk_signal_connect( GTK_OBJECT( gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON( spin ) ) ), "value-changed", GTK_SIGNAL_FUNC( OnUpdate ), NULL ); gtk_widget_show( spin ); gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 1, 2, @@ -618,7 +618,7 @@ void SurfaceDlg::BuildDialog() { spin = gtk_spin_button_new( GTK_ADJUSTMENT( gtk_adjustment_new( 0, -1000, 1000, 1, 10, 0 ) ), 0, 0 ); g_object_set_data( G_OBJECT( dlg ), "hscale", spin ); - gtk_signal_connect( GTK_OBJECT( gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON( spin ) ) ), "value_changed", + gtk_signal_connect( GTK_OBJECT( gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON( spin ) ) ), "value-changed", GTK_SIGNAL_FUNC( OnUpdate ), NULL ); gtk_widget_show( spin ); gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 2, 3, @@ -652,7 +652,7 @@ void SurfaceDlg::BuildDialog() { spin = gtk_spin_button_new( GTK_ADJUSTMENT( gtk_adjustment_new( 0, -1000, 1000, 1, 10, 0 ) ), 0, 0 ); g_object_set_data( G_OBJECT( dlg ), "vscale", spin ); - gtk_signal_connect( GTK_OBJECT( gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON( spin ) ) ), "value_changed", + gtk_signal_connect( GTK_OBJECT( gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON( spin ) ) ), "value-changed", GTK_SIGNAL_FUNC( OnUpdate ), NULL ); gtk_widget_show( spin ); gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 3, 4, @@ -686,7 +686,7 @@ void SurfaceDlg::BuildDialog() { spin = gtk_spin_button_new( GTK_ADJUSTMENT( gtk_adjustment_new( 0, -360, 360, 1, 10, 0 ) ), 1, 0 ); g_object_set_data( G_OBJECT( dlg ), "rotate", spin ); - gtk_signal_connect( GTK_OBJECT( gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON( spin ) ) ), "value_changed", + gtk_signal_connect( GTK_OBJECT( gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON( spin ) ) ), "value-changed", GTK_SIGNAL_FUNC( OnUpdate ), NULL ); gtk_widget_show( spin ); gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 4, 5, diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 87275870..8eb36694 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -1662,7 +1662,7 @@ void TexWnd::OnCreate(){ g_nTextureOffset = 0; GtkAdjustment *vadjustment = gtk_range_get_adjustment( GTK_RANGE( g_qeglobals_gui.d_texture_scroll ) ); - gtk_signal_connect( GTK_OBJECT( vadjustment ), "value_changed", GTK_SIGNAL_FUNC( vertical_scroll ), this ); + gtk_signal_connect( GTK_OBJECT( vadjustment ), "value-changed", GTK_SIGNAL_FUNC( vertical_scroll ), this ); if ( g_PrefsDlg.m_bTextureScrollbar ) { gtk_widget_show( g_qeglobals_gui.d_texture_scroll ); diff --git a/radiant/ui.cpp b/radiant/ui.cpp index 973f15b7..62446d97 100644 --- a/radiant/ui.cpp +++ b/radiant/ui.cpp @@ -78,7 +78,7 @@ static gint keypress( GtkWidget* widget, GdkEventKey* event, gpointer data ){ IWindowListener *pListen = static_cast( data ); ret = pListen->OnKeyPressed( gdk_keyval_name( event->keyval ) ); if ( ret ) { - gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key_press_event" ); + gtk_signal_emit_stop_by_name( GTK_OBJECT( widget ), "key-press-event" ); } return ret; } @@ -133,16 +133,16 @@ bool CGtkWindow::Show(){ GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ); // Connect signal handlers - gtk_signal_connect( GTK_OBJECT( m_pGLWidget ), "expose_event", GTK_SIGNAL_FUNC( expose ), this ); - gtk_signal_connect( GTK_OBJECT( m_pGLWidget ), "motion_notify_event", + gtk_signal_connect( GTK_OBJECT( m_pGLWidget ), "expose-event", GTK_SIGNAL_FUNC( expose ), this ); + gtk_signal_connect( GTK_OBJECT( m_pGLWidget ), "motion-notify-event", GTK_SIGNAL_FUNC( motion ), m_pListen ); - gtk_signal_connect( GTK_OBJECT( m_pGLWidget ), "button_press_event", + gtk_signal_connect( GTK_OBJECT( m_pGLWidget ), "button-press-event", GTK_SIGNAL_FUNC( button_press ), m_pListen ); - gtk_signal_connect( GTK_OBJECT( m_pGLWidget ), "button_release_event", + gtk_signal_connect( GTK_OBJECT( m_pGLWidget ), "button-release-event", GTK_SIGNAL_FUNC( button_release ), m_pListen ); - gtk_signal_connect( GTK_OBJECT( m_pWnd ), "delete_event", GTK_SIGNAL_FUNC( close_widget ), this ); - gtk_signal_connect( GTK_OBJECT( m_pWnd ), "key_press_event", + gtk_signal_connect( GTK_OBJECT( m_pWnd ), "delete-event", GTK_SIGNAL_FUNC( close_widget ), this ); + gtk_signal_connect( GTK_OBJECT( m_pWnd ), "key-press-event", GTK_SIGNAL_FUNC( keypress ), m_pListen ); gtk_widget_show( m_pGLWidget );