ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-09 23:01:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use GTK2 events

Browse source
This commit is contained in:
Pan7 2017-03-04 18:36:21 +01:00
parent d91edda475
commit afca61523a
31 changed files with 211 additions and 211 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/bkgrnd2d/dialog.cpp
View file

@ -325,11 +325,11 @@ void InitBackgroundDialog(){
// GTK_STOCK_CLOSE, // GTK_STOCK_CLOSE,
// GTK_RESPONSE_CLOSE, // GTK_RESPONSE_CLOSE,
NULL ); 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_FUNC( close_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( pDialogWnd ), "response", gtk_signal_connect( GTK_OBJECT( pDialogWnd ), "response",
GTK_SIGNAL_FUNC( response_callback ), NULL ); 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(); pTooltips = gtk_tooltips_new();

18
contrib/bobtoolz/dialogs/dialogs-gtk.cpp
View file

@ -207,7 +207,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
int mode = ( uType & MB_TYPEMASK ), ret, loop = 1; int mode = ( uType & MB_TYPEMASK ), ret, loop = 1;
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", gtk_signal_connect( GTK_OBJECT( window ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -321,7 +321,7 @@ int DoIntersectBox( IntersectRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Intersect" ); gtk_window_set_title( GTK_WINDOW( window ), "Intersect" );
@ -417,7 +417,7 @@ int DoPolygonBox( PolygonRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Polygon Builder" ); gtk_window_set_title( GTK_WINDOW( window ), "Polygon Builder" );
@ -592,7 +592,7 @@ int DoBuildStairsBox( BuildStairsRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Stair Builder" ); gtk_window_set_title( GTK_WINDOW( window ), "Stair Builder" );
@ -849,7 +849,7 @@ int DoDoorsBox( DoorRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Door Builder" ); gtk_window_set_title( GTK_WINDOW( window ), "Door Builder" );
@ -1063,7 +1063,7 @@ int DoPathPlotterBox( PathPlotterRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Texture Reset" ); gtk_window_set_title( GTK_WINDOW( window ), "Texture Reset" );
@ -1233,7 +1233,7 @@ int DoCTFColourChangeBox(){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "CTF Colour Changer" ); 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 ); 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_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Texture Reset" ); gtk_window_set_title( GTK_WINDOW( window ), "Texture Reset" );
@ -1640,7 +1640,7 @@ int DoTrainThingBox( TrainThingRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Train Thing" ); gtk_window_set_title( GTK_WINDOW( window ), "Train Thing" );

14
contrib/camera/dialogs.cpp
View file

@ -73,7 +73,7 @@ static gint ci_new( GtkWidget *widget, gpointer data ){
// create the window // create the window
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( window ), "New Camera" ); 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_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 ) ); 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 // create the window
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( window ), "Rename Path" ); 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_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 ) ); 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 // create the window
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( window ), "Add Target" ); 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_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 ) ); 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 // create the window
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( window ), _( "Add Event" ) ); 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_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 ) ); gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pCameraInspectorWnd ) );
@ -996,8 +996,8 @@ GtkWidget *CreateCameraInspectorDialog( void ){
// create the window // create the window
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( window ), _( "Camera Inspector" ) ); 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 ), "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 ), "expose-event", GTK_SIGNAL_FUNC( ci_expose ), NULL );
// gtk_signal_connect( GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), 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 ) ); gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pRadiantWnd ) );
@ -1219,7 +1219,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
gtk_widget_show( hbox ); gtk_widget_show( hbox );
g_pTimeLine = GTK_ADJUSTMENT( gtk_adjustment_new( 0, 0, 30000, 100, 250, 0 ) ); 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 ); w = gtk_hscale_new( g_pTimeLine );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_widget_show( w ); gtk_widget_show( w );

54
contrib/gtkgensurf/gendlgs.cpp
View file

@ -1361,7 +1361,7 @@ GtkWidget* create_main_dialog(){
g_pWnd = dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); g_pWnd = dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), gszCaption ); 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); // 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 ) ); gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pRadiantWnd ) );
@ -1373,7 +1373,7 @@ GtkWidget* create_main_dialog(){
notebook = gtk_notebook_new(); notebook = gtk_notebook_new();
gtk_widget_show( notebook ); gtk_widget_show( notebook );
gtk_box_pack_start( GTK_BOX( hbox ), notebook, TRUE, TRUE, 0 ); 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 ); G_CALLBACK( switch_page ), NULL );
gtk_notebook_set_tab_pos( GTK_NOTEBOOK( notebook ), GTK_POS_TOP ); gtk_notebook_set_tab_pos( GTK_NOTEBOOK( notebook ), GTK_POS_TOP );
g_object_set_data( G_OBJECT( dlg ), "notebook", notebook ); g_object_set_data( G_OBJECT( dlg ), "notebook", notebook );
@ -1498,7 +1498,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "wavelength", entry ); 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(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
@ -1507,7 +1507,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "amplitude", entry ); 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(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
@ -1516,10 +1516,10 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "roughness", entry ); 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 ); 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 ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 );
gtk_widget_show( spin ); gtk_widget_show( spin );
gtk_table_attach( GTK_TABLE( table2 ), spin, 1, 2, 3, 4, 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 ); (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "hmin", entry ); 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(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
@ -1607,7 +1607,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "hmax", entry ); 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(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
@ -1616,7 +1616,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "vmin", entry ); 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(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
@ -1625,7 +1625,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "vmax", entry ); 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" ) ); frame = gtk_frame_new( _( "Divisions" ) );
gtk_widget_show( frame ); gtk_widget_show( frame );
@ -1653,7 +1653,7 @@ GtkWidget* create_main_dialog(){
g_object_set_data( G_OBJECT( dlg ), "nv_text", label ); g_object_set_data( G_OBJECT( dlg ), "nv_text", label );
adj = gtk_adjustment_new( 8, 1, MAX_ROWS, 1, 10, 0 ); 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 ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 );
gtk_widget_show( spin ); gtk_widget_show( spin );
gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 0, 1, 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 ); g_object_set_data( G_OBJECT( dlg ), "nh", spin );
adj = gtk_adjustment_new( 8, 1, MAX_ROWS, 1, 10, 0 ); 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 ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 );
gtk_widget_show( spin ); gtk_widget_show( spin );
gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 1, 2, 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 ); gtk_object_set_data( GTK_OBJECT( dlg ), "snap_text", label );
adj = gtk_adjustment_new( 8, 0, 256, 1, 10, 0 ); 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 ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 );
gtk_widget_show( spin ); gtk_widget_show( spin );
gtk_box_pack_start( GTK_BOX( vbox ), spin, FALSE, TRUE, 0 ); 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 ); gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, TRUE, 0 );
adj = gtk_adjustment_new( 0, 0, 110, 1, 10, 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 ); g_object_set_data( G_OBJECT( dlg ), "decimate_adj", adj );
scale = gtk_hscale_new( GTK_ADJUSTMENT( adj ) ); scale = gtk_hscale_new( GTK_ADJUSTMENT( adj ) );
gtk_widget_show( scale ); gtk_widget_show( scale );
@ -1753,7 +1753,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "z01", entry ); 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(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
@ -1762,7 +1762,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "z00", entry ); 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(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
@ -1771,7 +1771,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "z11", entry ); 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(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
@ -1780,7 +1780,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "z10", entry ); 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" ); check = gtk_check_button_new_with_label( "Linear borders" );
gtk_widget_show( check ); gtk_widget_show( check );
@ -1823,7 +1823,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_FILL ), 0, 0 );
g_object_set_data( G_OBJECT( dlg ), "bmp_file", entry ); 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 ); hbox2 = gtk_hbox_new( TRUE, 5 );
gtk_widget_show( hbox2 ); gtk_widget_show( hbox2 );
@ -1881,7 +1881,7 @@ GtkWidget* create_main_dialog(){
gtk_box_pack_start( GTK_BOX( hbox2 ), entry, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( hbox2 ), entry, FALSE, FALSE, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "bmp_black", entry ); 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 ); hbox2 = gtk_hbox_new( FALSE, 5 );
gtk_widget_show( hbox2 ); gtk_widget_show( hbox2 );
@ -1894,7 +1894,7 @@ GtkWidget* create_main_dialog(){
gtk_box_pack_start( GTK_BOX( hbox2 ), entry, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( hbox2 ), entry, FALSE, FALSE, 0 );
gtk_widget_set_usize( entry, 50, -2 ); gtk_widget_set_usize( entry, 50, -2 );
g_object_set_data( G_OBJECT( dlg ), "bmp_white", entry ); 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 ); vbox = gtk_vbox_new( FALSE, 10 );
gtk_widget_show( vbox ); gtk_widget_show( vbox );
@ -1945,7 +1945,7 @@ GtkWidget* create_main_dialog(){
g_object_set_data( G_OBJECT( dlg ), "fix_rate_text", label ); g_object_set_data( G_OBJECT( dlg ), "fix_rate_text", label );
adj = gtk_adjustment_new( 0, -65536, 65536, 1, 16, 0 ); 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 ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 );
gtk_widget_show( spin ); gtk_widget_show( spin );
gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 0, 1, gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 0, 1,
@ -1953,7 +1953,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_EXPAND ), 0, 0 ); (GtkAttachOptions) ( GTK_EXPAND ), 0, 0 );
gtk_widget_set_usize( spin, 60, -2 ); gtk_widget_set_usize( spin, 60, -2 );
g_object_set_data( G_OBJECT( dlg ), "fix_value", spin ); 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(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
@ -1962,7 +1962,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 ); gtk_widget_set_usize( entry, 60, -2 );
g_object_set_data( G_OBJECT( dlg ), "fix_range", entry ); 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(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
@ -1971,7 +1971,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 ); gtk_widget_set_usize( entry, 60, -2 );
g_object_set_data( G_OBJECT( dlg ), "fix_rate", entry ); 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" ) ); button = gtk_button_new_with_label( _( "Free" ) );
gtk_widget_show( button ); gtk_widget_show( button );
@ -2034,7 +2034,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 ); gtk_widget_set_usize( entry, 60, -2 );
g_object_set_data( G_OBJECT( dlg ), "texture1", entry ); 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(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );
@ -2043,7 +2043,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_FILL ), 0, 0 ); (GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 ); gtk_widget_set_usize( entry, 60, -2 );
g_object_set_data( G_OBJECT( dlg ), "texture2", entry ); 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(); entry = gtk_entry_new();
gtk_widget_show( entry ); gtk_widget_show( entry );

16
contrib/gtkgensurf/view.cpp
View file

@ -373,7 +373,7 @@ void CreateViewWindow(){
g_pWndPreview = dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); g_pWndPreview = dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), "GtkGenSurf Preview" ); 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_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_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pWnd ) );
gtk_window_set_default_size( GTK_WINDOW( dlg ), 300, 400 ); 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 ); gtk_box_pack_start( GTK_BOX( hbox ), label, FALSE, TRUE, 0 );
adj = gtk_adjustment_new( 30, -90, 90, 1, 10, 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 ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 );
gtk_widget_show( spin ); gtk_widget_show( spin );
gtk_box_pack_start( GTK_BOX( hbox ), spin, FALSE, TRUE, 0 ); 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 ); 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 ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 );
gtk_widget_show( spin ); gtk_widget_show( spin );
gtk_spin_button_set_wrap( GTK_SPIN_BUTTON( spin ), TRUE ); gtk_spin_button_set_wrap( GTK_SPIN_BUTTON( spin ), TRUE );
@ -411,7 +411,7 @@ void CreateViewWindow(){
gtk_widget_show( label ); gtk_widget_show( label );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_box_pack_end( GTK_BOX( hbox ), label, FALSE, TRUE, 0 ); 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 #endif
frame = gtk_frame_new( NULL ); frame = gtk_frame_new( NULL );
@ -422,9 +422,9 @@ void CreateViewWindow(){
g_pPreviewWidget = g_UIGtkTable.m_pfn_glwidget_new( FALSE, NULL ); 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_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 ), "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 ), "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 ), "button-press-event",
GTK_SIGNAL_FUNC( button_press ), NULL ); GTK_SIGNAL_FUNC( button_press ), NULL );
gtk_widget_show( g_pPreviewWidget ); gtk_widget_show( g_pPreviewWidget );

2
contrib/prtview/AboutDialog.cpp
View file

@ -59,7 +59,7 @@ void DoAboutDlg(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), "About Portal Viewer" ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );

12
contrib/prtview/ConfigDialog.cpp
View file

@ -69,7 +69,7 @@ static int DoColor( COLORREF *c ){
dlg = gtk_color_selection_dialog_new( "Choose Color" ); dlg = gtk_color_selection_dialog_new( "Choose Color" );
gtk_color_selection_set_color( GTK_COLOR_SELECTION( GTK_COLOR_SELECTION_DIALOG( dlg )->colorsel ), clr ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -280,7 +280,7 @@ void DoConfigDialog(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Portal Viewer Configuration" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -314,7 +314,7 @@ void DoConfigDialog(){
lw3label = gtk_label_new( "" ); lw3label = gtk_label_new( "" );
gtk_widget_show( lw3label ); gtk_widget_show( lw3label );
gtk_box_pack_start( GTK_BOX( hbox ), lw3label, FALSE, TRUE, 0 ); 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 ); table = gtk_table_new( 2, 4, FALSE );
gtk_widget_show( table ); gtk_widget_show( table );
@ -410,7 +410,7 @@ void DoConfigDialog(){
(GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 ); (GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( translabel ), 0.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 ); adj = gtk_adjustment_new( portals.clip_range, 1, 128, 1, 1, 1 );
clipslider = gtk_hscale_new( GTK_ADJUSTMENT( adj ) ); clipslider = gtk_hscale_new( GTK_ADJUSTMENT( adj ) );
@ -426,7 +426,7 @@ void DoConfigDialog(){
(GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 ); (GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( cliplabel ), 0.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 ); hbox = gtk_hbox_new( TRUE, 5 );
gtk_widget_show( hbox ); gtk_widget_show( hbox );
@ -464,7 +464,7 @@ void DoConfigDialog(){
lw2label = gtk_label_new( "" ); lw2label = gtk_label_new( "" );
gtk_widget_show( lw2label ); gtk_widget_show( lw2label );
gtk_box_pack_start( GTK_BOX( hbox ), lw2label, FALSE, TRUE, 0 ); 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 ); hbox = gtk_hbox_new( FALSE, 5 );
gtk_widget_show( hbox ); gtk_widget_show( hbox );

4
contrib/prtview/LoadPortalFileDialog.cpp
View file

@ -75,7 +75,7 @@ static void change_clicked( GtkWidget *widget, gpointer data ){
GTK_SIGNAL_FUNC( file_sel_callback ), GINT_TO_POINTER( IDOK ) ); 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_connect( GTK_OBJECT( GTK_FILE_SELECTION( file_sel )->cancel_button ), "clicked",
GTK_SIGNAL_FUNC( file_sel_callback ), GINT_TO_POINTER( IDCANCEL ) ); 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_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION( file_sel ) ); gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION( file_sel ) );
@ -105,7 +105,7 @@ int DoLoadPortalFileDialog(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), "Load .prt" ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );

18
contrib/prtview/gtkdlgs.cpp
View file

@ -74,7 +74,7 @@ static void change_clicked( GtkWidget *widget, gpointer data ){
GTK_SIGNAL_FUNC( file_sel_callback ), GINT_TO_POINTER( IDOK ) ); 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_connect( GTK_OBJECT( GTK_FILE_SELECTION( file_sel )->cancel_button ), "clicked",
GTK_SIGNAL_FUNC( file_sel_callback ), GINT_TO_POINTER( IDCANCEL ) ); 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_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION( file_sel ) ); gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION( file_sel ) );
@ -107,7 +107,7 @@ int DoLoadPortalFileDialog(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), "Load .prt" ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -200,7 +200,7 @@ void DoAboutDlg(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), "About Portal Viewer" ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -254,7 +254,7 @@ static int DoColor( COLORREF *c ){
dlg = gtk_color_selection_dialog_new( "Choose Color" ); dlg = gtk_color_selection_dialog_new( "Choose Color" );
gtk_color_selection_set_color( GTK_COLOR_SELECTION( GTK_COLOR_SELECTION_DIALOG( dlg )->colorsel ), clr ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -465,7 +465,7 @@ void DoConfigDialog(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Portal Viewer Configuration" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -499,7 +499,7 @@ void DoConfigDialog(){
lw3label = gtk_label_new( "" ); lw3label = gtk_label_new( "" );
gtk_widget_show( lw3label ); gtk_widget_show( lw3label );
gtk_box_pack_start( GTK_BOX( hbox ), lw3label, FALSE, TRUE, 0 ); 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 ); table = gtk_table_new( 2, 4, FALSE );
gtk_widget_show( table ); gtk_widget_show( table );
@ -595,7 +595,7 @@ void DoConfigDialog(){
(GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 ); (GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( translabel ), 0.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 ); adj = gtk_adjustment_new( portals.clip_range, 1, 128, 1, 1, 1 );
clipslider = gtk_hscale_new( GTK_ADJUSTMENT( adj ) ); clipslider = gtk_hscale_new( GTK_ADJUSTMENT( adj ) );
@ -611,7 +611,7 @@ void DoConfigDialog(){
(GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 ); (GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( cliplabel ), 0.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 ); hbox = gtk_hbox_new( TRUE, 5 );
gtk_widget_show( hbox ); gtk_widget_show( hbox );
@ -649,7 +649,7 @@ void DoConfigDialog(){
lw2label = gtk_label_new( "" ); lw2label = gtk_label_new( "" );
gtk_widget_show( lw2label ); gtk_widget_show( lw2label );
gtk_box_pack_start( GTK_BOX( hbox ), lw2label, FALSE, TRUE, 0 ); 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 ); hbox = gtk_hbox_new( FALSE, 5 );
gtk_widget_show( hbox ); gtk_widget_show( hbox );

32
plugins/surface/surfacedialog.cpp
View file

@ -95,7 +95,7 @@ texdef_t g_old_texdef;
// when TRUE, this thing means the surface inspector is currently being displayed // when TRUE, this thing means the surface inspector is currently being displayed
bool g_surfwin = FALSE; 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) // (need to turn off when we are feeding data in)
bool g_bListenChanged = true; bool g_bListenChanged = true;
// turn on/off listening of the update messages // turn on/off listening of the update messages
@ -1140,7 +1140,7 @@ GtkWidget* create_SurfaceInspector( void ){
// closing the window (upper right window manager click) // closing the window (upper right window manager click)
g_signal_connect( (gpointer) SurfaceInspector, g_signal_connect( (gpointer) SurfaceInspector,
"delete_event", "delete-event",
G_CALLBACK( apply_and_hide ), G_CALLBACK( apply_and_hide ),
NULL ); NULL );
@ -1148,11 +1148,11 @@ GtkWidget* create_SurfaceInspector( void ){
G_CALLBACK( gtk_widget_destroy ), G_CALLBACK( gtk_widget_destroy ),
NULL ); 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 ), G_CALLBACK( on_texture_combo_entry_key_press_event ),
NULL ); NULL );
g_signal_connect( (gpointer) SurfaceInspector, "key_press_event", g_signal_connect( (gpointer) SurfaceInspector, "key-press-event",
G_CALLBACK( surface_dialog_key_press ), G_CALLBACK( surface_dialog_key_press ),
NULL ); NULL );
@ -1160,35 +1160,35 @@ GtkWidget* create_SurfaceInspector( void ){
G_CALLBACK( on_texture_combo_entry_activate ), G_CALLBACK( on_texture_combo_entry_activate ),
NULL ); 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 ), G_CALLBACK( on_hshift_value_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_vshift_value_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_hscale_value_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_vscale_value_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_rotate_value_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_hshift_step_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_vshift_step_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_hscale_step_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_vscale_step_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_rotate_step_spinbutton_value_changed ),
NULL ); NULL );
@ -1196,10 +1196,10 @@ GtkWidget* create_SurfaceInspector( void ){
G_CALLBACK( on_match_grid_button_clicked ), G_CALLBACK( on_match_grid_button_clicked ),
NULL ); 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 ), G_CALLBACK( on_fit_width_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_fit_height_spinbutton_value_changed ),
NULL ); NULL );
g_signal_connect( (gpointer) fit_button, "clicked", g_signal_connect( (gpointer) fit_button, "clicked",

32
plugins/surface_idtech2/surfacedialog.cpp
View file

@ -73,7 +73,7 @@ char old_texture_entry[128];
// when TRUE, this thing means the surface inspector is currently being displayed // when TRUE, this thing means the surface inspector is currently being displayed
bool g_surfwin = FALSE; 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) // (need to turn off when we are feeding data in)
bool g_bListenChanged = TRUE; bool g_bListenChanged = TRUE;
// turn on/off listening of the update messages // turn on/off listening of the update messages
@ -789,52 +789,52 @@ GtkWidget* create_SurfaceInspector( void ){
create_SurfaceFlagsFrame( vbox1 ); create_SurfaceFlagsFrame( vbox1 );
g_signal_connect( (gpointer) SurfaceInspector, g_signal_connect( (gpointer) SurfaceInspector,
"delete_event", "delete-event",
G_CALLBACK( delete_event_callback ), G_CALLBACK( delete_event_callback ),
NULL ); NULL );
g_signal_connect( (gpointer) SurfaceInspector, "destroy", g_signal_connect( (gpointer) SurfaceInspector, "destroy",
G_CALLBACK( gtk_widget_destroy ), G_CALLBACK( gtk_widget_destroy ),
NULL ); NULL );
g_signal_connect( (gpointer) SurfaceInspector, "key_press_event", g_signal_connect( (gpointer) SurfaceInspector, "key-press-event",
G_CALLBACK( surface_inspector_key_press_event ), G_CALLBACK( surface_inspector_key_press_event ),
NULL ); 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 ), G_CALLBACK( on_texture_combo_entry_key_press_event ),
NULL ); NULL );
g_signal_connect( (gpointer) texture_combo_entry, "activate", g_signal_connect( (gpointer) texture_combo_entry, "activate",
G_CALLBACK( on_texture_combo_entry_activate ), G_CALLBACK( on_texture_combo_entry_activate ),
NULL ); 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 ), G_CALLBACK( on_hshift_value_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_vshift_value_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_hscale_value_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_vscale_value_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_rotate_value_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_hshift_step_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_vshift_step_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_hscale_step_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_vscale_step_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_rotate_step_spinbutton_value_changed ),
NULL ); NULL );
@ -842,10 +842,10 @@ GtkWidget* create_SurfaceInspector( void ){
G_CALLBACK( on_match_grid_button_clicked ), G_CALLBACK( on_match_grid_button_clicked ),
NULL ); 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 ), G_CALLBACK( on_fit_width_spinbutton_value_changed ),
NULL ); 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 ), G_CALLBACK( on_fit_height_spinbutton_value_changed ),
NULL ); NULL );
g_signal_connect( (gpointer) fit_button, "clicked", g_signal_connect( (gpointer) fit_button, "clicked",

4
plugins/surface_idtech2/surfaceflags.cpp
View file

@ -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 ), GTK_SIGNAL_FUNC( on_value_entry_insert_text ),
user_data ); 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 ); g_free( result );
} }
@ -365,7 +365,7 @@ GtkWidget* create_SurfaceFlagsFrame( GtkWidget* surfacedialog_widget ){
gtk_signal_connect( GTK_OBJECT( value_entry ), "changed", gtk_signal_connect( GTK_OBJECT( value_entry ), "changed",
GTK_SIGNAL_FUNC( on_value_entry_changed ), GTK_SIGNAL_FUNC( on_value_entry_changed ),
NULL ); 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 ), GTK_SIGNAL_FUNC( on_value_entry_insert_text ),
NULL ); NULL );
gtk_entry_set_max_length( (GtkEntry *)value_entry, 11 ); gtk_entry_set_max_length( (GtkEntry *)value_entry, 11 );

14
plugins/textool/TexTool.cpp
View file

@ -55,7 +55,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
int mode = ( uType & MB_TYPEMASK ), ret, loop = 1; int mode = ( uType & MB_TYPEMASK ), ret, loop = 1;
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", gtk_signal_connect( GTK_OBJECT( window ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); 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 ); GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK );
// Connect signal handlers // Connect signal handlers
gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "expose_event", GTK_SIGNAL_FUNC( expose ), NULL ); 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 ), "motion-notify-event",
GTK_SIGNAL_FUNC( motion ), NULL ); 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_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_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 ), "delete-event", GTK_SIGNAL_FUNC( close ), NULL );
gtk_signal_connect( GTK_OBJECT( g_pToolWnd ), "key_press_event", gtk_signal_connect( GTK_OBJECT( g_pToolWnd ), "key-press-event",
GTK_SIGNAL_FUNC( keypress ), NULL ); GTK_SIGNAL_FUNC( keypress ), NULL );
return g_pToolWidget; return g_pToolWidget;

2
radiant/bp_dlg.cpp
View file

@ -59,7 +59,7 @@ int BP_MessageBox( int status ){
int ret, loop = 1; int ret, loop = 1;
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_FUNC( BP_dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", gtk_signal_connect( GTK_OBJECT( window ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );

2
radiant/camwindow.cpp
View file

@ -514,7 +514,7 @@ void CamWnd::ToggleFreeMove(){
// RR2DO2: FIXME why does this only work the 2nd and // RR2DO2: FIXME why does this only work the 2nd and
// further times the event is called? (floating windows // further times the event is called? (floating windows
// mode seems to work fine though...) // 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 ); GTK_SIGNAL_FUNC( camwindow_focusout ), g_pParentWnd );
{ {

2
radiant/dialog.cpp
View file

@ -81,7 +81,7 @@ static gint delete_event_callback( GtkWidget *widget, GdkEvent* event, gpointer
void Dialog::Create(){ void Dialog::Create(){
if ( m_bNeedBuild ) { if ( m_bNeedBuild ) {
m_pWidget = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_FUNC( delete_event_callback ), this );
gtk_signal_connect( GTK_OBJECT( m_pWidget ), "destroy", gtk_signal_connect( GTK_OBJECT( m_pWidget ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );

2
radiant/dialoginfo.cpp
View file

@ -41,7 +41,7 @@ void ShowInfoDialog( const char* pText ){
g_dlgInfo = dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); g_dlgInfo = dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), "Information" ); 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_FUNC( gtk_widget_hide ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );

4
radiant/findtexturedialog.cpp
View file

@ -146,7 +146,7 @@ void FindTextureDialog::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 0, 1, gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 ); (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 ); GTK_SIGNAL_FUNC( find_focus_in ), NULL );
AddDialogData( entry, &m_strFind, DLG_ENTRY_TEXT ); 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, gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 ); (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 ); GTK_SIGNAL_FUNC( replace_focus_in ), NULL );
AddDialogData( entry, &m_strReplace, DLG_ENTRY_TEXT ); AddDialogData( entry, &m_strReplace, DLG_ENTRY_TEXT );

12
radiant/glwindow.cpp
View file

@ -215,13 +215,13 @@ GLWindow::GLWindow( bool zbuffer ) {
// Connect signal handlers // Connect signal handlers
gtk_signal_connect( GTK_OBJECT( m_pWidget ), "realize", GTK_SIGNAL_FUNC( realize ), this ); 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 ), "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 ), "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-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 ), "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 ), "size-allocate", GTK_SIGNAL_FUNC( resize ), this );
#if GTK_CHECK_VERSION( 1,3,0 ) #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 #endif
} }

14
radiant/groupdialog.cpp
View file

@ -1228,9 +1228,9 @@ void GroupDlg::Create(){
load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posEntityWnd ); load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posEntityWnd );
gtk_window_set_title( GTK_WINDOW( dlg ), "Entities" ); 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' // 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 ) ); gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pParentWnd->m_pWidget ) );
g_qeglobals_gui.d_entity = dlg; 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 ) ); GtkWidget* view = gtk_tree_view_new_with_model( GTK_TREE_MODEL( store ) );
gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( view ), FALSE ); 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 ), "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 ), "key-press-event", G_CALLBACK( eclasslist_keypress ), this );
{ {
GtkCellRenderer* renderer = gtk_cell_renderer_text_new(); GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
@ -1411,7 +1411,7 @@ void GroupDlg::Create(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 ); (GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_events( entry, GDK_KEY_PRESS_MASK ); 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 ); GTK_SIGNAL_FUNC( entityentry_keypress ), this );
EntWidgets[EntKeyField] = entry; EntWidgets[EntKeyField] = entry;
} }
@ -1423,7 +1423,7 @@ void GroupDlg::Create(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 ); (GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_events( entry, GDK_KEY_PRESS_MASK ); 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 ); GTK_SIGNAL_FUNC( entityentry_keypress ), this );
EntWidgets[EntValueField] = entry; EntWidgets[EntValueField] = entry;
} }
@ -1628,6 +1628,6 @@ void GroupDlg::Create(){
inspector_mode = W_ENTITY; inspector_mode = W_ENTITY;
m_pWidget = dlg; 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 );
} }
} }

46
radiant/gtkdlgs.cpp
View file

@ -120,7 +120,7 @@ static void DoProjectAddEdit( bool edit, GtkWidget *parent ){
else{ else{
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Add Command" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -469,7 +469,7 @@ void DoProjectSettings(){
project = gtk_window_new( GTK_WINDOW_TOPLEVEL ); project = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( project ), _( "Project Settings" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( project ), "destroy", gtk_signal_connect( GTK_OBJECT( project ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -1232,7 +1232,7 @@ void DoMapInfo(){
load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posMapInfoWnd ); load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posMapInfoWnd );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Map Info" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -1494,7 +1494,7 @@ void DoEntityList(){
load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posEntityInfoWnd ); load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posEntityInfoWnd );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Entities" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); 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 ); 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 ) ); 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 ); gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( view ), FALSE );
{ {
@ -1695,7 +1695,7 @@ void DoRotateDlg(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Arbitrary rotation" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -1806,7 +1806,7 @@ void DoGamma(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Gamma" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -2017,7 +2017,7 @@ void DoFind(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Find Brush" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); 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 ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Arbitrary sides" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -2183,7 +2183,7 @@ void DoNewPatchDlg(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Patch density" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -2291,7 +2291,7 @@ void DoScaleDlg(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Scale" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -2406,7 +2406,7 @@ void DoThickenDlg(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Thicken Patch" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); 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_position( GTK_WINDOW( dlg ), GTK_WIN_POS_CENTER_ON_PARENT );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "About GtkRadiant" ) ); gtk_window_set_title( GTK_WINDOW( dlg ), _( "About GtkRadiant" ) );
gtk_window_set_resizable( GTK_WINDOW( dlg ), FALSE ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); 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_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_position( GTK_WINDOW( dlg ), GTK_WIN_POS_CENTER_ON_PARENT );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Shortcut List" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -2831,7 +2831,7 @@ void DoTextureListDlg(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Textures" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); 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 ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Cap" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -3084,7 +3084,7 @@ void DoScriptsDlg(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Available Scripts - Not Implemented Yet" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); 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 ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "BrushScript Input" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -3318,7 +3318,7 @@ int DoTextureLayout( float *fx, float *fy ){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Patch texture layout" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -3423,7 +3423,7 @@ char* DoNameDlg( const char* title ){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), title ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -3501,7 +3501,7 @@ char* DoNewProjectDlg(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "New Project" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
@ -3685,7 +3685,7 @@ static void CreateGtkTextEditor(){
dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_SIGNAL_FUNC( editor_delete ), NULL );
gtk_window_set_default_size( GTK_WINDOW( dlg ), 600, 300 ); 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 ); dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Light intensity" ) ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );

8
radiant/gtkfilesel-darwin.c
View file

@ -758,9 +758,9 @@ gtk_file_selection_init( GtkFileSelection *filesel ){
gtk_widget_show( label ); gtk_widget_show( label );
filesel->selection_entry = gtk_entry_new(); 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 ); (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, (GtkSignalFunc) gtk_widget_grab_default,
GTK_OBJECT( filesel->ok_button ) ); GTK_OBJECT( filesel->ok_button ) );
gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "activate", gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "activate",
@ -1396,7 +1396,7 @@ gtk_file_selection_key_press( GtkWidget *widget,
g_free( text ); 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; return TRUE;
} }
@ -1606,7 +1606,7 @@ gtk_file_selection_history_combo_callback( GtkWidget *widget, GdkEventKey *event
strcat( path,"/" ); strcat( path,"/" );
gtk_file_selection_populate( fs,path,TRUE ); gtk_file_selection_populate( fs,path,TRUE );
g_free( path ); 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; return TRUE;
} }
else else

16
radiant/gtkfilesel-linux.c
View file

@ -1362,7 +1362,7 @@ gtk_file_selection_init( GtkFileSelection *filesel ){
gtk_signal_connect( GTK_OBJECT( filesel->dir_list ), "unselect_row", gtk_signal_connect( GTK_OBJECT( filesel->dir_list ), "unselect_row",
(GtkSignalFunc) gtk_file_selection_undir_button, (GtkSignalFunc) gtk_file_selection_undir_button,
(gpointer) filesel ); (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 ), GTK_SIGNAL_FUNC( gtk_file_selection_show_fileop_menu ),
(gpointer) filesel ); (gpointer) filesel );
@ -1432,7 +1432,7 @@ gtk_file_selection_init( GtkFileSelection *filesel ){
(GtkSignalFunc) gtk_file_selection_files_list_key_callback, (GtkSignalFunc) gtk_file_selection_files_list_key_callback,
(gpointer) filesel ); (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 ), GTK_SIGNAL_FUNC( gtk_file_selection_show_fileop_menu ),
(gpointer) filesel ); (gpointer) filesel );
@ -1479,7 +1479,7 @@ gtk_file_selection_init( GtkFileSelection *filesel ){
filesel->selection_entry = gtk_entry_new(); 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 ); (GtkSignalFunc) gtk_file_selection_key_press, filesel );
gtk_table_attach( GTK_TABLE( table ), filesel->selection_entry, 1, 2, 0, 1, gtk_table_attach( GTK_TABLE( table ), filesel->selection_entry, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
@ -1527,7 +1527,7 @@ gtk_file_selection_init( GtkFileSelection *filesel ){
filesel->ok_button = gtk_button_new_with_label( _( "OK" ) ); filesel->ok_button = gtk_button_new_with_label( _( "OK" ) );
GTK_WIDGET_SET_FLAGS( filesel->ok_button, GTK_CAN_DEFAULT ); 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_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, (GtkSignalFunc) gtk_widget_grab_default,
GTK_OBJECT( filesel->ok_button ) ); GTK_OBJECT( filesel->ok_button ) );
gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "activate", gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "activate",
@ -2854,7 +2854,7 @@ gtk_file_selection_key_press( GtkWidget *widget,
g_free( text ); 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; 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 ); g_print( "complete: %s\n",fs->saved_entry1 );
/* gtk_label_set_text(GTK_LABEL(fs->completion_label),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 { else {
if ( fs->saved_entry1 ) { 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 ); gtk_file_selection_refresh_button( widget,fs );
if ( event->keyval == GDK_Return ) { 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; return TRUE;
} }
@ -3181,7 +3181,7 @@ gtk_file_selection_history_combo_callback( GtkWidget *widget, GdkEventKey *event
strcat( path,"/" ); strcat( path,"/" );
gtk_file_selection_populate( fs,path,TRUE ); gtk_file_selection_populate( fs,path,TRUE );
g_free( path ); 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; return TRUE;
} }
else else

8
radiant/gtkfilesel.c
View file

@ -737,9 +737,9 @@ gtk_file_selection_init( GtkFileSelection *filesel ){
gtk_widget_show( label ); gtk_widget_show( label );
filesel->selection_entry = gtk_entry_new(); 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 ); (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, (GtkSignalFunc) gtk_widget_grab_default,
GTK_OBJECT( filesel->ok_button ) ); GTK_OBJECT( filesel->ok_button ) );
gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "activate", gtk_signal_connect_object( GTK_OBJECT( filesel->selection_entry ), "activate",
@ -1375,7 +1375,7 @@ gtk_file_selection_key_press( GtkWidget *widget,
g_free( text ); 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; return TRUE;
} }
@ -1585,7 +1585,7 @@ gtk_file_selection_history_combo_callback( GtkWidget *widget, GdkEventKey *event
strcat( path,"/" ); strcat( path,"/" );
gtk_file_selection_populate( fs,path,TRUE ); gtk_file_selection_populate( fs,path,TRUE );
g_free( path ); 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; return TRUE;
} }
else else

6
radiant/gtkmisc.cpp
View file

@ -889,7 +889,7 @@ int WINAPI gtk_MessageBoxNew( void *parent, const char *message,
// create dialog window // create dialog window
GtkWidget *dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); 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; int mode = ( uType & MB_TYPEMASK ), ret, loop = 1;
window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", gtk_signal_connect( GTK_OBJECT( window ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); 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 ); dlg = gtk_color_selection_dialog_new( title );
gtk_color_selection_set_color( GTK_COLOR_SELECTION( GTK_COLOR_SELECTION_DIALOG( dlg )->colorsel ), clr ); 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_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL ); GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );

26
radiant/mainframe.cpp
View file

@ -806,7 +806,7 @@ static gint mainframe_keypress( GtkWidget* widget, GdkEventKey* event, gpointer
} }
if ( ( g_Commands[i].m_nModifiers & 0x7 ) == nState ) { if ( ( g_Commands[i].m_nModifiers & 0x7 ) == nState ) {
HandleCommand( NULL, GINT_TO_POINTER( g_Commands[i].m_nCommand ) ); 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; return FALSE;
} }
} }
@ -837,7 +837,7 @@ static gint mainframe_keyrelease( GtkWidget* widget, GdkEventKey* event, gpointe
case ID_CAMERA_STRAFERIGHT: case ID_CAMERA_STRAFERIGHT:
{ {
HandleKeyUp( NULL, GINT_TO_POINTER( g_Commands[i].m_nCommand ) ); 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) if (mainframe->CurrentStyle() != MainFrame::eFloating)
gtk_window_set_transient_for( GTK_WINDOW( wnd ), GTK_WINDOW( mainframe->m_pWidget ) ); 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_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 ), "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_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_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_SIGNAL_FUNC( mainframe_map ), mainframe );
gtk_window_set_default_size( GTK_WINDOW( wnd ), 100, 100 ); gtk_window_set_default_size( GTK_WINDOW( wnd ), 100, 100 );
@ -2370,8 +2370,8 @@ GtkWidget* create_framed_texwnd( TexWnd* texwnd ){
w = gtk_entry_new(); w = gtk_entry_new();
gtk_box_pack_start( GTK_BOX( texbox ), w, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( texbox ), w, FALSE, FALSE, 0 );
texwnd->m_pFilter = w; 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-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-out-event", G_CALLBACK( entry_focus_out ), NULL );
w = texwnd->GetWidget(); w = texwnd->GetWidget();
gtk_box_pack_start( GTK_BOX( texbox ), w, TRUE, TRUE, 0 ); 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 ); GtkWidget* window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
m_pWidget = window; m_pWidget = window;
gtk_widget_set_events( window, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK ); 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_FUNC( mainframe_delete ), this );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", gtk_signal_connect( GTK_OBJECT( window ), "destroy",
GTK_SIGNAL_FUNC( mainframe_destroy ), this ); 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_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_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_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 ); GTK_SIGNAL_FUNC( mainframe_unmap ), this );
g_qeglobals_gui.d_main_window = window; g_qeglobals_gui.d_main_window = window;

14
radiant/patchdialog.cpp
View file

@ -298,9 +298,9 @@ void PatchDialog::BuildDialog(){
load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posPatchWnd ); load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posPatchWnd );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Patch Properties" ) ); 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' // 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 ) ); 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 ); gtk_entry_set_text( GTK_ENTRY( entry ), buf );
adj = gtk_adjustment_new( 0, -8192, 8192, 1, 1, 0 ); 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 ); g_object_set_data( G_OBJECT( m_pWidget ), "hshift_adj", adj );
spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); 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 ); gtk_entry_set_text( GTK_ENTRY( entry ), buf );
adj = gtk_adjustment_new( 0, -8192, 8192, 1, 1, 0 ); 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 ); g_object_set_data( G_OBJECT( m_pWidget ), "vshift_adj", adj );
spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); 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 ); gtk_entry_set_text( GTK_ENTRY( entry ), buf );
adj = gtk_adjustment_new( 0, -1000, 1000, 1, 1, 0 ); 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 ); g_object_set_data( G_OBJECT( m_pWidget ), "hscale_adj", adj );
spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); 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 ); gtk_entry_set_text( GTK_ENTRY( entry ), buf );
adj = gtk_adjustment_new( 0, -1000, 1000, 1, 1, 0 ); 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 ); g_object_set_data( G_OBJECT( m_pWidget ), "vscale_adj", adj );
spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); 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 ); 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 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 ); g_object_set_data( G_OBJECT( m_pWidget ), "rotate_adj", adj );
spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 ); spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 );

2
radiant/patchdialog.h
View file

@ -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 // 0 is invalid, otherwise it's the Id of the last 'do' we are responsible for
// int m_nUndoId; // 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) // (need to turn off when we are feeding data in)
// NOTE: much more simple than blocking signals // NOTE: much more simple than blocking signals
bool m_bListenChanged; bool m_bListenChanged;

18
radiant/surfacedialog.cpp
View file

@ -51,7 +51,7 @@ texdef_t g_old_texdef;
// when != NULL, this thing means the surface inspector is currently being displayed // 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 // NOTE a boolean flag would have been more explicit, this is totally so ugly
GtkWidget* g_surfwin = NULL; 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) // (need to turn off when we are feeding data in)
bool g_bListenChanged = true; bool g_bListenChanged = true;
// the struct used to store the increments (saved in registry) // 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 ); load_window_pos( dlg, g_PrefsDlg.mWindowInfo.posSurfaceWnd );
gtk_window_set_title( GTK_WINDOW( dlg ), _( "Surface inspector" ) ); 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 // 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 ) ); gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pParentWnd->m_pWidget ) );
// replaced by only the vbox: // replaced by only the vbox:
@ -529,7 +529,7 @@ void SurfaceDlg::BuildDialog() {
gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, TRUE, 0 ); gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, TRUE, 0 );
entry = gtk_entry_new(); 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_widget_show( entry );
gtk_box_pack_start( GTK_BOX( hbox2 ), entry, TRUE, TRUE, 0 ); gtk_box_pack_start( GTK_BOX( hbox2 ), entry, TRUE, TRUE, 0 );
g_object_set_data( G_OBJECT( m_pWidget ), "texture", entry ); 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 ); 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 ); 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_SIGNAL_FUNC( OnUpdate ), NULL );
gtk_widget_show( spin ); gtk_widget_show( spin );
gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 0, 1, 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 ); 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 ); 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_SIGNAL_FUNC( OnUpdate ), NULL );
gtk_widget_show( spin ); gtk_widget_show( spin );
gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 1, 2, 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 ); 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 ); 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_SIGNAL_FUNC( OnUpdate ), NULL );
gtk_widget_show( spin ); gtk_widget_show( spin );
gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 2, 3, 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 ); 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 ); 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_SIGNAL_FUNC( OnUpdate ), NULL );
gtk_widget_show( spin ); gtk_widget_show( spin );
gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 3, 4, 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 ); 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 ); 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_SIGNAL_FUNC( OnUpdate ), NULL );
gtk_widget_show( spin ); gtk_widget_show( spin );
gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 4, 5, gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 4, 5,

2
radiant/texwindow.cpp
View file

@ -1662,7 +1662,7 @@ void TexWnd::OnCreate(){
g_nTextureOffset = 0; g_nTextureOffset = 0;
GtkAdjustment *vadjustment = gtk_range_get_adjustment( GTK_RANGE( g_qeglobals_gui.d_texture_scroll ) ); 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 ) { if ( g_PrefsDlg.m_bTextureScrollbar ) {
gtk_widget_show( g_qeglobals_gui.d_texture_scroll ); gtk_widget_show( g_qeglobals_gui.d_texture_scroll );

14
radiant/ui.cpp
View file

@ -78,7 +78,7 @@ static gint keypress( GtkWidget* widget, GdkEventKey* event, gpointer data ){
IWindowListener *pListen = static_cast<IWindowListener *>( data ); IWindowListener *pListen = static_cast<IWindowListener *>( data );
ret = pListen->OnKeyPressed( gdk_keyval_name( event->keyval ) ); ret = pListen->OnKeyPressed( gdk_keyval_name( event->keyval ) );
if ( ret ) { 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; return ret;
} }
@ -133,16 +133,16 @@ bool CGtkWindow::Show(){
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ); GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK );
// Connect signal handlers // Connect signal handlers
gtk_signal_connect( GTK_OBJECT( m_pGLWidget ), "expose_event", GTK_SIGNAL_FUNC( expose ), this ); 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 ), "motion-notify-event",
GTK_SIGNAL_FUNC( motion ), m_pListen ); 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_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_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 ), "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 ), "key-press-event",
GTK_SIGNAL_FUNC( keypress ), m_pListen ); GTK_SIGNAL_FUNC( keypress ), m_pListen );
gtk_widget_show( m_pGLWidget ); gtk_widget_show( m_pGLWidget );