quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace gtk_signal_connect, GTK_OBJECT, GTK_SIGNAL_FUNC, gtk_object_set_data, gtk_object_get_data

Browse Source
This commit is contained in:
Garux 2020-05-20 03:28:25 +03:00
parent 4f8e6e7ee5
commit cd529b4fb0
16 changed files with 290 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/bkgrnd2d/dialog.cpp
View File

@ -320,11 +320,11 @@ void InitBackgroundDialog(){
// GTK_STOCK_CLOSE,
// GTK_RESPONSE_CLOSE,
NULL );
gtk_signal_connect( GTK_OBJECT( pDialogWnd ), "delete_event",
GTK_SIGNAL_FUNC( close_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( pDialogWnd ), "response",
GTK_SIGNAL_FUNC( response_callback ), NULL );
// gtk_signal_connect( GTK_OBJECT (pDialogWnd), "expose_event", GTK_SIGNAL_FUNC( ci_expose ), NULL );
g_signal_connect( G_OBJECT( pDialogWnd ), "delete_event",
G_CALLBACK( close_callback ), NULL );
g_signal_connect( G_OBJECT( pDialogWnd ), "response",
G_CALLBACK( response_callback ), NULL );
// g_signal_connect( G_OBJECT (pDialogWnd), "expose_event", G_CALLBACK( ci_expose ), NULL );
pTooltips = gtk_tooltips_new();

136
contrib/bobtoolz/dialogs/dialogs-gtk.cpp
View File

@ -218,10 +218,10 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pRadiantWnd ) );
gtk_window_set_modal( GTK_WINDOW( window ), TRUE );
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 );
g_signal_connect( G_OBJECT( window ), "delete_event",
G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy",
G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), lpCaption );
gtk_container_border_width( GTK_CONTAINER( window ), 10 );
g_object_set_data( G_OBJECT( window ), "loop", &loop );
@ -248,8 +248,8 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess
if ( type == eMB_OK ) {
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
@ -258,38 +258,38 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess
else if ( type == eMB_OKCANCEL ) {
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
}
else if ( type == eMB_YESNOCANCEL ) {
w = gtk_button_new_with_label( "Yes" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
w = gtk_button_new_with_label( "No" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
}
@ -297,16 +297,16 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess
{
w = gtk_button_new_with_label( "Yes" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
w = gtk_button_new_with_label( "No" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) );
gtk_widget_show( w );
ret = eIDNO;
}
@ -333,8 +333,8 @@ EMessageBoxReturn DoIntersectBox( IntersectRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Intersect" );
gtk_container_border_width( GTK_CONTAINER( window ), 10 );
@ -381,7 +381,7 @@ EMessageBoxReturn DoIntersectBox( IntersectRS* rs ){
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
@ -389,7 +389,7 @@ EMessageBoxReturn DoIntersectBox( IntersectRS* rs ){
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
@ -432,8 +432,8 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pRadiantWnd ) );
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 );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Polygon Builder" );
gtk_container_border_width( GTK_CONTAINER( window ), 10 );
@ -536,7 +536,7 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
@ -544,7 +544,7 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
@ -607,8 +607,8 @@ EMessageBoxReturn DoBuildStairsBox( BuildStairsRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Stair Builder" );
@ -779,14 +779,14 @@ EMessageBoxReturn DoBuildStairsBox( BuildStairsRS* rs ){
w = gtk_button_new_with_label( "OK" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
@ -863,8 +863,8 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Door Builder" );
@ -965,7 +965,7 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){
tw1.two = comboMain;
buttonSetMain = gtk_button_new_with_label( "Set As Main Texture" );
gtk_signal_connect( GTK_OBJECT( buttonSetMain ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback_settex ), &tw1 );
g_signal_connect( G_OBJECT( buttonSetMain ), "clicked", G_CALLBACK( dialog_button_callback_settex ), &tw1 );
gtk_box_pack_start( GTK_BOX( hbox ), buttonSetMain, FALSE, FALSE, 0 );
gtk_widget_show( buttonSetMain );
@ -985,7 +985,7 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){
tw2.two = comboTrim;
buttonSetTrim = gtk_button_new_with_label( "Set As Trim Texture" );
gtk_signal_connect( GTK_OBJECT( buttonSetTrim ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback_settex ), &tw2 );
g_signal_connect( G_OBJECT( buttonSetTrim ), "clicked", G_CALLBACK( dialog_button_callback_settex ), &tw2 );
gtk_box_pack_start( GTK_BOX( hbox ), buttonSetTrim, FALSE, FALSE, 0 );
gtk_widget_show( buttonSetTrim );
@ -1024,14 +1024,14 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){
w = gtk_button_new_with_label( "OK" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
@ -1078,8 +1078,8 @@ EMessageBoxReturn DoPathPlotterBox( PathPlotterRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Texture Reset" );
gtk_container_border_width( GTK_CONTAINER( window ), 10 );
@ -1185,7 +1185,7 @@ EMessageBoxReturn DoPathPlotterBox( PathPlotterRS* rs ){
w = gtk_button_new_with_label( "Enable" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
gtk_widget_show( w );
gtk_widget_set_can_default( w, TRUE );
@ -1193,12 +1193,12 @@ EMessageBoxReturn DoPathPlotterBox( PathPlotterRS* rs ){
w = gtk_button_new_with_label( "Disable" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
@ -1249,8 +1249,8 @@ EMessageBoxReturn DoCTFColourChangeBox(){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "CTF Colour Changer" );
gtk_container_border_width( GTK_CONTAINER( window ), 10 );
@ -1276,7 +1276,7 @@ EMessageBoxReturn DoCTFColourChangeBox(){
w = gtk_button_new_with_label( "Red->Blue" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
@ -1284,12 +1284,12 @@ EMessageBoxReturn DoCTFColourChangeBox(){
w = gtk_button_new_with_label( "Blue->Red" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
@ -1322,8 +1322,8 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){
gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pRadiantWnd ) );
gtk_window_set_modal( GTK_WINDOW( window ), TRUE );
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 );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Texture Reset" );
gtk_container_border_width( GTK_CONTAINER( window ), 10 );
@ -1369,7 +1369,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){
// ---- frame ----
dlgTexReset.cbTexChange = gtk_check_button_new_with_label( "Enabled" );
gtk_signal_connect( GTK_OBJECT( dlgTexReset.cbTexChange ), "toggled", GTK_SIGNAL_FUNC( dialog_button_callback_texreset_update ), NULL );
g_signal_connect( G_OBJECT( dlgTexReset.cbTexChange ), "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL );
gtk_widget_show( dlgTexReset.cbTexChange );
gtk_table_attach( GTK_TABLE( table ), dlgTexReset.cbTexChange, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
@ -1417,7 +1417,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){
// ---- frame ----
dlgTexReset.cbScaleHor = gtk_check_button_new_with_label( "Enabled" );
gtk_signal_connect( GTK_OBJECT( dlgTexReset.cbScaleHor ), "toggled", GTK_SIGNAL_FUNC( dialog_button_callback_texreset_update ), NULL );
g_signal_connect( G_OBJECT( dlgTexReset.cbScaleHor ), "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL );
gtk_widget_show( dlgTexReset.cbScaleHor );
gtk_table_attach( GTK_TABLE( table ), dlgTexReset.cbScaleHor, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
@ -1438,7 +1438,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){
dlgTexReset.cbScaleVert = gtk_check_button_new_with_label( "Enabled" );
gtk_signal_connect( GTK_OBJECT( dlgTexReset.cbScaleVert ), "toggled", GTK_SIGNAL_FUNC( dialog_button_callback_texreset_update ), NULL );
g_signal_connect( G_OBJECT( dlgTexReset.cbScaleVert ), "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL );
gtk_widget_show( dlgTexReset.cbScaleVert );
gtk_table_attach( GTK_TABLE( table ), dlgTexReset.cbScaleVert, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
@ -1473,7 +1473,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){
// ---- frame ----
dlgTexReset.cbShiftHor = gtk_check_button_new_with_label( "Enabled" );
gtk_signal_connect( GTK_OBJECT( dlgTexReset.cbShiftHor ), "toggled", GTK_SIGNAL_FUNC( dialog_button_callback_texreset_update ), NULL );
g_signal_connect( G_OBJECT( dlgTexReset.cbShiftHor ), "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL );
gtk_widget_show( dlgTexReset.cbShiftHor );
gtk_table_attach( GTK_TABLE( table ), dlgTexReset.cbShiftHor, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
@ -1494,7 +1494,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){
dlgTexReset.cbShiftVert = gtk_check_button_new_with_label( "Enabled" );
gtk_signal_connect( GTK_OBJECT( dlgTexReset.cbShiftVert ), "toggled", GTK_SIGNAL_FUNC( dialog_button_callback_texreset_update ), NULL );
g_signal_connect( G_OBJECT( dlgTexReset.cbShiftVert ), "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL );
gtk_widget_show( dlgTexReset.cbShiftVert );
gtk_table_attach( GTK_TABLE( table ), dlgTexReset.cbShiftVert, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
@ -1557,7 +1557,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){
w = gtk_button_new_with_label( "Use Selected Brushes" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
@ -1565,12 +1565,12 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){
w = gtk_button_new_with_label( "Use All Brushes" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
@ -1658,14 +1658,14 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Train Thing" );
gtk_container_border_width( GTK_CONTAINER( window ), 10 );
gtk_object_set_data( GTK_OBJECT( window ), "loop", &loop );
gtk_object_set_data( GTK_OBJECT( window ), "ret", &ret );
g_object_set_data( G_OBJECT( window ), "loop", &loop );
g_object_set_data( G_OBJECT( window ), "ret", &ret );
gtk_widget_realize( window );
@ -1844,7 +1844,7 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
@ -1852,7 +1852,7 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
@ -1921,8 +1921,8 @@ EMessageBoxReturn DoMakeChainBox( MakeChainRS* rs ){
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Make Chain" );
@ -1983,14 +1983,14 @@ EMessageBoxReturn DoMakeChainBox( MakeChainRS* rs ){
w = gtk_button_new_with_label( "OK" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;

76
contrib/camera/dialogs.cpp
View File

@ -71,8 +71,8 @@ static gint ci_new( GtkWidget *widget, gpointer data ){
// create the window
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( window ), "New Camera" );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pCameraInspectorWnd ) );
g_object_set_data( G_OBJECT( window ), "loop", &loop );
@ -131,7 +131,7 @@ static gint ci_new( GtkWidget *widget, gpointer data ){
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_show( w );
gtk_widget_set_can_default( w, TRUE );
@ -139,7 +139,7 @@ static gint ci_new( GtkWidget *widget, gpointer data ){
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
@ -364,8 +364,8 @@ static gint ci_rename( GtkWidget *widget, gpointer data ){
// create the window
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( window ), "Rename Path" );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pCameraInspectorWnd ) );
g_object_set_data( G_OBJECT( window ), "loop", &loop );
@ -413,7 +413,7 @@ static gint ci_rename( GtkWidget *widget, gpointer data ){
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_show( w );
gtk_widget_set_can_default( w, TRUE );
@ -421,7 +421,7 @@ static gint ci_rename( GtkWidget *widget, gpointer data ){
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
@ -483,8 +483,8 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ){
// create the window
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( window ), "Add Target" );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pCameraInspectorWnd ) );
g_object_set_data( G_OBJECT( window ), "loop", &loop );
@ -560,7 +560,7 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ){
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_show( w );
gtk_widget_set_can_default( w, TRUE );
@ -568,7 +568,7 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ){
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
@ -834,8 +834,8 @@ static gint ci_add( GtkWidget *widget, gpointer data ){
// create the window
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( window ), "Add Event" );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pCameraInspectorWnd ) );
g_object_set_data( G_OBJECT( window ), "loop", &loop );
@ -903,7 +903,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ){
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
gtk_widget_show( w );
gtk_widget_set_can_default( w, TRUE );
@ -911,7 +911,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ){
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
@ -1000,9 +1000,9 @@ GtkWidget *CreateCameraInspectorDialog( void ){
// create the window
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( window ), "Camera Inspector" );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event", GTK_SIGNAL_FUNC( ci_close ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "expose_event", GTK_SIGNAL_FUNC( ci_expose ), NULL );
// gtk_signal_connect( GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event", G_CALLBACK( ci_close ), NULL );
g_signal_connect( G_OBJECT( window ), "expose_event", G_CALLBACK( ci_expose ), NULL );
// g_signal_connect( G_OBJECT (window), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_transient_for( GTK_WINDOW( window ), GTK_WINDOW( g_pRadiantWnd ) );
// don't use show, as you don't want to have it displayed on startup ;-)
@ -1069,7 +1069,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
RefreshCamListCombo();
gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO( g_pCamListCombo )->entry ), FALSE );
gtk_signal_connect( GTK_OBJECT( GTK_COMBO( g_pCamListCombo )->entry ), "changed", GTK_SIGNAL_FUNC( ci_camlist_changed ), NULL );
g_signal_connect( G_OBJECT( GTK_COMBO( g_pCamListCombo )->entry ), "changed", G_CALLBACK( ci_camlist_changed ), NULL );
// -------------------------- //
@ -1101,7 +1101,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
RefreshPathListCombo();
gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO( g_pPathListCombo )->entry ), FALSE );
gtk_signal_connect( GTK_OBJECT( GTK_COMBO( g_pPathListCombo )->entry ), "changed", GTK_SIGNAL_FUNC( ci_pathlist_changed ), NULL );
g_signal_connect( G_OBJECT( GTK_COMBO( g_pPathListCombo )->entry ), "changed", G_CALLBACK( ci_pathlist_changed ), NULL );
// -------------------------- //
@ -1114,14 +1114,14 @@ GtkWidget *CreateCameraInspectorDialog( void ){
gtk_widget_show( g_pEditModeEditRadioButton );
g_pEditTypeRadio = gtk_radio_button_group( GTK_RADIO_BUTTON( g_pEditModeEditRadioButton ) );
gtk_signal_connect( GTK_OBJECT( g_pEditModeEditRadioButton ), "clicked", GTK_SIGNAL_FUNC( ci_editmode_edit ), NULL );
g_signal_connect( G_OBJECT( g_pEditModeEditRadioButton ), "clicked", G_CALLBACK( ci_editmode_edit ), NULL );
g_pEditModeAddRadioButton = gtk_radio_button_new_with_label( g_pEditTypeRadio, "Add Points" );
gtk_box_pack_start( GTK_BOX( hbox ), g_pEditModeAddRadioButton, FALSE, FALSE, 3 );
gtk_widget_show( g_pEditModeAddRadioButton );
g_pEditTypeRadio = gtk_radio_button_group( GTK_RADIO_BUTTON( g_pEditModeAddRadioButton ) );
gtk_signal_connect( GTK_OBJECT( g_pEditModeAddRadioButton ), "clicked", GTK_SIGNAL_FUNC( ci_editmode_add ), NULL );
g_signal_connect( G_OBJECT( g_pEditModeAddRadioButton ), "clicked", G_CALLBACK( ci_editmode_add ), NULL );
// see if we should use a different default
if ( g_iEditMode == 1 ) {
@ -1146,23 +1146,23 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_button_new_with_label( "Rename..." );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_rename ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_rename ), NULL );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Add Target..." );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_add_target ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_add_target ), NULL );
gtk_widget_show( w );
// not available in splines library
/*w = gtk_button_new_with_label( "Delete Selected" );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, TRUE, 0);
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_delete_selected ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_delete_selected ), NULL );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Select All" );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, TRUE, 0);
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_select_all ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_select_all ), NULL );
gtk_widget_show( w );*/
// -------------------------- //
@ -1223,7 +1223,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
gtk_widget_show( hbox );
g_pTimeLine = GTK_ADJUSTMENT( gtk_adjustment_new( 0, 0, 30000, 100, 250, 0 ) );
gtk_signal_connect( GTK_OBJECT( g_pTimeLine ), "value_changed", GTK_SIGNAL_FUNC( ci_timeline_changed ), NULL );
g_signal_connect( G_OBJECT( g_pTimeLine ), "value_changed", G_CALLBACK( ci_timeline_changed ), NULL );
w = gtk_hscale_new( g_pTimeLine );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_widget_show( w );
@ -1263,7 +1263,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
g_pEventsList = gtk_clist_new( 3 );
gtk_container_add( GTK_CONTAINER( w ), g_pEventsList );
//gtk_signal_connect( GTK_OBJECT(g_pEventsList), "select_row", GTK_SIGNAL_FUNC (proplist_select_row), NULL);
//g_signal_connect( G_OBJECT(g_pEventsList), "select_row", G_CALLBACK (proplist_select_row), NULL);
gtk_clist_set_selection_mode( GTK_CLIST( g_pEventsList ), GTK_SELECTION_BROWSE );
gtk_clist_column_titles_hide( GTK_CLIST( g_pEventsList ) );
gtk_clist_set_column_auto_resize( GTK_CLIST( g_pEventsList ), 0, TRUE );
@ -1277,12 +1277,12 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_button_new_with_label( "Add..." );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_add ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_add ), NULL );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Del" );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_del ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_del ), NULL );
gtk_widget_show( w );
// -------------------------- //
@ -1304,12 +1304,12 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_button_new_with_label( "New..." );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_new ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_new ), NULL );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Load..." );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_load ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_load ), NULL );
gtk_widget_show( w );
// -------------------------- //
@ -1322,12 +1322,12 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_button_new_with_label( "Save..." );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_save ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_save ), NULL );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Unload" );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_unload ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_unload ), NULL );
gtk_widget_show( w );
hbox = gtk_hbox_new( FALSE, 5 );
@ -1336,12 +1336,12 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_button_new_with_label( "Apply" );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_apply ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_apply ), NULL );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Preview" );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_preview ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_preview ), NULL );
gtk_widget_show( w );
// -------------------------- //
@ -1358,7 +1358,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_button_new_with_label( "Close" );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_close ), NULL );
g_signal_connect( G_OBJECT( w ), "clicked", G_CALLBACK( ci_close ), NULL );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );

2
contrib/gtkgensurf/gendlgs.cpp
View File

@ -1678,7 +1678,7 @@ GtkWidget* create_main_dialog(){
label = gtk_label_new( "Snap to grid:" );
gtk_widget_show( label );
gtk_box_pack_start( GTK_BOX( vbox ), label, FALSE, TRUE, 0 );
gtk_object_set_data( GTK_OBJECT( dlg ), "snap_text", label );
g_object_set_data( G_OBJECT( dlg ), "snap_text", label );
adj = gtk_adjustment_new( 8, 0, 256, 1, 10, 0 );
g_signal_connect( G_OBJECT( adj ), "value_changed", G_CALLBACK( extents_snaptogrid_spin ), &SP );

16
contrib/gtkgensurf/view.cpp
View File

@ -379,8 +379,8 @@ void CreateViewWindow(){
g_pWndPreview = dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_title( GTK_WINDOW( dlg ), "GtkGenSurf Preview" );
gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", GTK_SIGNAL_FUNC( preview_close ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( dlg ), "delete_event", G_CALLBACK( preview_close ), NULL );
g_signal_connect( G_OBJECT( dlg ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pWnd ) );
gtk_window_set_default_size( GTK_WINDOW( dlg ), 300, 400 );
@ -400,14 +400,14 @@ void CreateViewWindow(){
gtk_box_pack_start( GTK_BOX( hbox ), label, FALSE, TRUE, 0 );
adj = gtk_adjustment_new( 30, -90, 90, 1, 10, 0 );
gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( preview_spin ), &elevation );
g_signal_connect( adj, "value_changed", G_CALLBACK( preview_spin ), &elevation );
spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 );
gtk_widget_show( spin );
gtk_box_pack_start( GTK_BOX( hbox ), spin, FALSE, TRUE, 0 );
g_signal_connect( G_OBJECT( spin ), "focus_out_event", G_CALLBACK( doublevariable_spinfocusout ), &elevation );
adj = gtk_adjustment_new( 30, 0, 359, 1, 10, 0 );
gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( preview_spin ), &azimuth );
g_signal_connect( adj, "value_changed", G_CALLBACK( preview_spin ), &azimuth );
spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 );
gtk_widget_show( spin );
gtk_spin_button_set_wrap( GTK_SPIN_BUTTON( spin ), TRUE );
@ -428,10 +428,10 @@ void CreateViewWindow(){
g_pPreviewWidget = g_UIGtkTable.m_pfn_glwidget_new( FALSE, NULL );
gtk_widget_set_events( g_pPreviewWidget, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK );
gtk_signal_connect( GTK_OBJECT( g_pPreviewWidget ), "expose_event", GTK_SIGNAL_FUNC( expose ), NULL );
gtk_signal_connect( GTK_OBJECT( g_pPreviewWidget ), "motion_notify_event", GTK_SIGNAL_FUNC( motion ), NULL );
gtk_signal_connect( GTK_OBJECT( g_pPreviewWidget ), "button_press_event",
GTK_SIGNAL_FUNC( button_press ), NULL );
g_signal_connect( G_OBJECT( g_pPreviewWidget ), "expose_event", G_CALLBACK( expose ), NULL );
g_signal_connect( G_OBJECT( g_pPreviewWidget ), "motion_notify_event", G_CALLBACK( motion ), NULL );
g_signal_connect( G_OBJECT( g_pPreviewWidget ), "button_press_event",
G_CALLBACK( button_press ), NULL );
gtk_widget_show( g_pPreviewWidget );
gtk_container_add( GTK_CONTAINER( frame ), g_pPreviewWidget );

50
contrib/hydratoolz/plugin.cpp
View File

@ -63,8 +63,8 @@ static void dialog_button_callback( GtkWidget *widget, gpointer data ){
int *loop, *ret;
parent = gtk_widget_get_toplevel( widget );
loop = (int*)gtk_object_get_data( GTK_OBJECT( parent ), "loop" );
ret = (int*)gtk_object_get_data( GTK_OBJECT( parent ), "ret" );
loop = (int*)g_object_get_data( G_OBJECT( parent ), "loop" );
ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" );
*loop = 0;
*ret = gpointer_to_int( data );
@ -74,7 +74,7 @@ static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer
int *loop;
gtk_widget_hide( widget );
loop = (int*)gtk_object_get_data( GTK_OBJECT( widget ), "loop" );
loop = (int*)g_object_get_data( G_OBJECT( widget ), "loop" );
*loop = 0;
return TRUE;
@ -85,14 +85,14 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
int mode = ( uType & MB_TYPEMASK ), ret, loop = 1;
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event",
GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event",
G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy",
G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), lpCaption );
gtk_container_border_width( GTK_CONTAINER( window ), 10 );
gtk_object_set_data( GTK_OBJECT( window ), "loop", &loop );
gtk_object_set_data( GTK_OBJECT( window ), "ret", &ret );
g_object_set_data( G_OBJECT( window ), "loop", &loop );
g_object_set_data( G_OBJECT( window ), "ret", &ret );
gtk_widget_realize( window );
vbox = gtk_vbox_new( FALSE, 10 );
@ -115,8 +115,8 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
if ( mode == MB_OK ) {
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
@ -125,38 +125,38 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
else if ( mode == MB_OKCANCEL ) {
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
gtk_widget_show( w );
ret = IDCANCEL;
}
else if ( mode == MB_YESNOCANCEL ) {
w = gtk_button_new_with_label( "Yes" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDYES ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDYES ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
w = gtk_button_new_with_label( "No" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDNO ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDNO ) );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
gtk_widget_show( w );
ret = IDCANCEL;
}
@ -164,16 +164,16 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
{
w = gtk_button_new_with_label( "Yes" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDYES ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDYES ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
w = gtk_button_new_with_label( "No" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDNO ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDNO ) );
gtk_widget_show( w );
ret = IDNO;
}

56
contrib/meshtex/GeneralFunctionDialog.cpp
View File

@ -129,7 +129,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
button = gtk_radio_button_new_with_label(NULL,
DIALOG_GEN_FUNC_SURFACE_VALUES);
gtk_object_set_data(GTK_OBJECT(_dialog), "surface", button);
g_object_set_data(G_OBJECT(_dialog), "surface", button);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
gtk_widget_show(button);
@ -137,7 +137,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
button = gtk_radio_button_new_with_label(
gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
DIALOG_GEN_FUNC_CONTROL_VALUES);
gtk_object_set_data(GTK_OBJECT(_dialog), "control", button);
g_object_set_data(G_OBJECT(_dialog), "control", button);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button);
@ -150,7 +150,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
// be active when it is checked.
applybutton = gtk_check_button_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "s_apply", applybutton);
g_object_set_data(G_OBJECT(_dialog), "s_apply", applybutton);
gtk_table_attach_defaults(GTK_TABLE(table), applybutton, 0, 1, 2, 3);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(applybutton), TRUE);
gtk_widget_show(applybutton);
@ -162,7 +162,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "s_oldval", entry);
g_object_set_data(G_OBJECT(_dialog), "s_oldval", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "1.0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 2, 3, 2, 3);
gtk_widget_set_usize(entry, 50, -2);
@ -177,7 +177,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "s_rowdist", entry);
g_object_set_data(G_OBJECT(_dialog), "s_rowdist", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0.0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 4, 5, 2, 3);
gtk_widget_set_usize(entry, 50, -2);
@ -192,7 +192,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "s_coldist", entry);
g_object_set_data(G_OBJECT(_dialog), "s_coldist", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0.0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 6, 7, 2, 3);
gtk_widget_set_usize(entry, 50, -2);
@ -207,7 +207,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "s_rownum", entry);
g_object_set_data(G_OBJECT(_dialog), "s_rownum", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0.0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 8, 9, 2, 3);
gtk_widget_set_usize(entry, 50, -2);
@ -222,7 +222,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "s_colnum", entry);
g_object_set_data(G_OBJECT(_dialog), "s_colnum", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0.0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 10, 11, 2, 3);
gtk_widget_set_usize(entry, 50, -2);
@ -237,7 +237,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "s_constant", entry);
g_object_set_data(G_OBJECT(_dialog), "s_constant", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0.0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 12, 13, 2, 3);
gtk_widget_set_usize(entry, 50, -2);
@ -250,7 +250,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
// be active when it is checked.
applybutton = gtk_check_button_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "t_apply", applybutton);
g_object_set_data(G_OBJECT(_dialog), "t_apply", applybutton);
gtk_table_attach_defaults(GTK_TABLE(table), applybutton, 0, 1, 3, 4);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(applybutton), TRUE);
gtk_widget_show(applybutton);
@ -262,7 +262,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "t_oldval", entry);
g_object_set_data(G_OBJECT(_dialog), "t_oldval", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "1.0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 2, 3, 3, 4);
gtk_widget_set_usize(entry, 50, -2);
@ -277,7 +277,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "t_rowdist", entry);
g_object_set_data(G_OBJECT(_dialog), "t_rowdist", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0.0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 4, 5, 3, 4);
gtk_widget_set_usize(entry, 50, -2);
@ -292,7 +292,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "t_coldist", entry);
g_object_set_data(G_OBJECT(_dialog), "t_coldist", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0.0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 6, 7, 3, 4);
gtk_widget_set_usize(entry, 50, -2);
@ -307,7 +307,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "t_rownum", entry);
g_object_set_data(G_OBJECT(_dialog), "t_rownum", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0.0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 8, 9, 3, 4);
gtk_widget_set_usize(entry, 50, -2);
@ -322,7 +322,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "t_colnum", entry);
g_object_set_data(G_OBJECT(_dialog), "t_colnum", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0.0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 10, 11, 3, 4);
gtk_widget_set_usize(entry, 50, -2);
@ -337,7 +337,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "t_constant", entry);
g_object_set_data(G_OBJECT(_dialog), "t_constant", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0.0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 12, 13, 3, 4);
gtk_widget_set_usize(entry, 50, -2);
@ -377,7 +377,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
gtk_widget_show(button);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "col_num_align", entry);
g_object_set_data(G_OBJECT(_dialog), "col_num_align", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0");
gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
gtk_widget_set_usize(entry, 25, -2);
@ -388,7 +388,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
button = gtk_radio_button_new_with_label(
gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
DIALOG_GEN_FUNC_MAX_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "col_max_align", button);
g_object_set_data(G_OBJECT(_dialog), "col_max_align", button);
gtk_box_pack_end(GTK_BOX(hbox), button, TRUE, FALSE, 5);
gtk_widget_show(button);
@ -399,7 +399,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
// Widgets for specifying the reference row & usage.
refbutton = gtk_check_button_new_with_label(DIALOG_GEN_FUNC_REF_ROW_FRAME_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "row_ref", refbutton);
g_object_set_data(G_OBJECT(_dialog), "row_ref", refbutton);
gtk_widget_show(refbutton);
frame = gtk_frame_new(NULL);
@ -424,7 +424,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(refbutton, button);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "row_num_ref", entry);
g_object_set_data(G_OBJECT(_dialog), "row_num_ref", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0");
gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
gtk_widget_set_usize(entry, 25, -2);
@ -437,7 +437,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
button = gtk_radio_button_new_with_label(
gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
DIALOG_GEN_FUNC_MAX_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "row_max_ref", button);
g_object_set_data(G_OBJECT(_dialog), "row_max_ref", button);
gtk_box_pack_end(GTK_BOX(hbox), button, TRUE, FALSE, 5);
gtk_widget_set_sensitive(button, FALSE);
gtk_widget_show(button);
@ -449,7 +449,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
gtk_widget_show(hbox);
button = gtk_check_button_new_with_label(DIALOG_GEN_FUNC_REF_TOTAL_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "row_ref_total", button);
g_object_set_data(G_OBJECT(_dialog), "row_ref_total", button);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
gtk_widget_set_sensitive(button, FALSE);
@ -485,7 +485,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
gtk_widget_show(button);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "row_num_align", entry);
g_object_set_data(G_OBJECT(_dialog), "row_num_align", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0");
gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
gtk_widget_set_usize(entry, 25, -2);
@ -496,7 +496,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
button = gtk_radio_button_new_with_label(
gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
DIALOG_GEN_FUNC_MAX_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "row_max_align", button);
g_object_set_data(G_OBJECT(_dialog), "row_max_align", button);
gtk_box_pack_end(GTK_BOX(hbox), button, TRUE, FALSE, 5);
gtk_widget_show(button);
@ -507,7 +507,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
// Widgets for specifying the reference column & usage.
refbutton = gtk_check_button_new_with_label(DIALOG_GEN_FUNC_REF_COL_FRAME_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "col_ref", refbutton);
g_object_set_data(G_OBJECT(_dialog), "col_ref", refbutton);
gtk_widget_show(refbutton);
frame = gtk_frame_new(NULL);
@ -532,7 +532,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(refbutton, button);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "col_num_ref", entry);
g_object_set_data(G_OBJECT(_dialog), "col_num_ref", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0");
gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
gtk_widget_set_usize(entry, 25, -2);
@ -545,7 +545,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
button = gtk_radio_button_new_with_label(
gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
DIALOG_GEN_FUNC_MAX_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "col_max_ref", button);
g_object_set_data(G_OBJECT(_dialog), "col_max_ref", button);
gtk_box_pack_end(GTK_BOX(hbox), button, TRUE, FALSE, 5);
gtk_widget_set_sensitive(button, FALSE);
gtk_widget_show(button);
@ -557,7 +557,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
gtk_widget_show(hbox);
button = gtk_check_button_new_with_label(DIALOG_GEN_FUNC_REF_TOTAL_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "col_ref_total", button);
g_object_set_data(G_OBJECT(_dialog), "col_ref_total", button);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
gtk_widget_set_sensitive(button, FALSE);

2
contrib/meshtex/GenericDialog.h
View File

@ -40,7 +40,7 @@
* @param widgetName Name of the contained widget to find.
*/
#define NamedWidget(widgetName) \
(gtk_object_get_data(GTK_OBJECT(_dialog), widgetName))
(g_object_get_data(G_OBJECT(_dialog), widgetName))
/**
* Macro to enable/disable a widget inside the dialog, selected by name.

10
contrib/meshtex/GetInfoDialog.cpp
View File

@ -113,7 +113,7 @@ GetInfoDialog::GetInfoDialog(const std::string& key,
// Widgets for specifying the reference row if any.
button = gtk_check_button_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "s_apply", button);
g_object_set_data(G_OBJECT(_dialog), "s_apply", button);
gtk_table_attach_defaults(GTK_TABLE(table), button, 0, 1, 0, 1);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
gtk_widget_show(button);
@ -124,7 +124,7 @@ GetInfoDialog::GetInfoDialog(const std::string& key,
gtk_widget_show(label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "s_ref_row", entry);
g_object_set_data(G_OBJECT(_dialog), "s_ref_row", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 2, 3, 0, 1);
gtk_widget_set_usize(entry, 50, -2);
@ -136,7 +136,7 @@ GetInfoDialog::GetInfoDialog(const std::string& key,
// Widgets for specifying the reference column if any.
button = gtk_check_button_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "t_apply", button);
g_object_set_data(G_OBJECT(_dialog), "t_apply", button);
gtk_table_attach_defaults(GTK_TABLE(table), button, 0, 1, 1, 2);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
gtk_widget_show(button);
@ -147,7 +147,7 @@ GetInfoDialog::GetInfoDialog(const std::string& key,
gtk_widget_show(label);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "t_ref_col", entry);
g_object_set_data(G_OBJECT(_dialog), "t_ref_col", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0");
gtk_table_attach_defaults(GTK_TABLE(table), entry, 2, 3, 1, 2);
gtk_widget_set_usize(entry, 50, -2);
@ -159,7 +159,7 @@ GetInfoDialog::GetInfoDialog(const std::string& key,
// Checkbox to enable the callbacks to Set S/T Scale.
button = gtk_check_button_new_with_label(DIALOG_GET_INFO_XFER_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "transfer", button);
g_object_set_data(G_OBJECT(_dialog), "transfer", button);
gtk_table_attach(GTK_TABLE(table), button, 0, 3, 2, 3, GTK_EXPAND, GTK_EXPAND, 0, 0);
gtk_widget_show(button);

44
contrib/meshtex/SetScaleDialog.cpp
View File

@ -116,7 +116,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
// will only be active when it is checked.
applybutton = gtk_check_button_new_with_label(DIALOG_SET_SCALE_S_ACTIVE_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "s_apply", applybutton);
g_object_set_data(G_OBJECT(_dialog), "s_apply", applybutton);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(applybutton), TRUE);
gtk_widget_show(applybutton);
@ -154,14 +154,14 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
gtk_widget_show(hbox);
button = gtk_radio_button_new_with_label(NULL, DIALOG_SET_SCALE_TILES_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "s_tiling", button);
g_object_set_data(G_OBJECT(_dialog), "s_tiling", button);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
gtk_widget_show(button);
UIInstance().RegisterWidgetDependence(applybutton, button);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "s_tiles", entry);
g_object_set_data(G_OBJECT(_dialog), "s_tiles", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "1");
gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
gtk_widget_set_usize(entry, 50, -2);
@ -178,7 +178,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
button = gtk_radio_button_new_with_label(
gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
DIALOG_SET_SCALE_NATURAL_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "s_natural", button);
g_object_set_data(G_OBJECT(_dialog), "s_natural", button);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
gtk_widget_show(button);
@ -186,7 +186,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, button);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "s_scale", entry);
g_object_set_data(G_OBJECT(_dialog), "s_scale", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "1");
gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
gtk_widget_set_usize(entry, 50, -2);
@ -228,7 +228,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, button);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "col_num_align", entry);
g_object_set_data(G_OBJECT(_dialog), "col_num_align", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0");
gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
gtk_widget_set_usize(entry, 25, -2);
@ -240,7 +240,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
button = gtk_radio_button_new_with_label(
gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
DIALOG_SET_SCALE_MAX_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "col_max_align", button);
g_object_set_data(G_OBJECT(_dialog), "col_max_align", button);
gtk_box_pack_end(GTK_BOX(hbox), button, TRUE, FALSE, 5);
gtk_widget_show(button);
@ -253,7 +253,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
// Widgets for specifying the reference row & usage.
refbutton = gtk_check_button_new_with_label(DIALOG_SET_SCALE_S_REF_ROW_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "row_ref", refbutton);
g_object_set_data(G_OBJECT(_dialog), "row_ref", refbutton);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(refbutton), TRUE);
gtk_widget_show(refbutton);
@ -281,7 +281,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(refbutton, button);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "row_num_ref", entry);
g_object_set_data(G_OBJECT(_dialog), "row_num_ref", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0");
gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
gtk_widget_set_usize(entry, 25, -2);
@ -294,7 +294,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
button = gtk_radio_button_new_with_label(
gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
DIALOG_SET_SCALE_MAX_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "row_max_ref", button);
g_object_set_data(G_OBJECT(_dialog), "row_max_ref", button);
gtk_box_pack_end(GTK_BOX(hbox), button, TRUE, FALSE, 5);
gtk_widget_show(button);
@ -306,7 +306,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
gtk_widget_show(hbox);
button = gtk_check_button_new_with_label(DIALOG_SET_SCALE_REF_TOTAL_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "row_ref_total", button);
g_object_set_data(G_OBJECT(_dialog), "row_ref_total", button);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
gtk_widget_show(button);
@ -319,7 +319,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
// will only be active when it is checked.
applybutton = gtk_check_button_new_with_label(DIALOG_SET_SCALE_T_ACTIVE_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "t_apply", applybutton);
g_object_set_data(G_OBJECT(_dialog), "t_apply", applybutton);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(applybutton), TRUE);
gtk_widget_show(applybutton);
@ -357,14 +357,14 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
gtk_widget_show(hbox);
button = gtk_radio_button_new_with_label(NULL, DIALOG_SET_SCALE_TILES_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "t_tiling", button);
g_object_set_data(G_OBJECT(_dialog), "t_tiling", button);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
gtk_widget_show(button);
UIInstance().RegisterWidgetDependence(applybutton, button);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "t_tiles", entry);
g_object_set_data(G_OBJECT(_dialog), "t_tiles", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "1");
gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
gtk_widget_set_usize(entry, 50, -2);
@ -381,7 +381,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
button = gtk_radio_button_new_with_label(
gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
DIALOG_SET_SCALE_NATURAL_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "t_natural", button);
g_object_set_data(G_OBJECT(_dialog), "t_natural", button);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
gtk_widget_show(button);
@ -389,7 +389,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, button);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "t_scale", entry);
g_object_set_data(G_OBJECT(_dialog), "t_scale", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "1");
gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
gtk_widget_set_usize(entry, 50, -2);
@ -431,7 +431,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(applybutton, button);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "row_num_align", entry);
g_object_set_data(G_OBJECT(_dialog), "row_num_align", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0");
gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
gtk_widget_set_usize(entry, 25, -2);
@ -443,7 +443,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
button = gtk_radio_button_new_with_label(
gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
DIALOG_SET_SCALE_MAX_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "row_max_align", button);
g_object_set_data(G_OBJECT(_dialog), "row_max_align", button);
gtk_box_pack_end(GTK_BOX(hbox), button, TRUE, FALSE, 5);
gtk_widget_show(button);
@ -456,7 +456,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
// Widgets for specifying the reference column & usage.
refbutton = gtk_check_button_new_with_label(DIALOG_SET_SCALE_T_REF_COL_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "col_ref", refbutton);
g_object_set_data(G_OBJECT(_dialog), "col_ref", refbutton);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(refbutton), TRUE);
gtk_widget_show(refbutton);
@ -484,7 +484,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
UIInstance().RegisterWidgetDependence(refbutton, button);
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(_dialog), "col_num_ref", entry);
g_object_set_data(G_OBJECT(_dialog), "col_num_ref", entry);
gtk_entry_set_text(GTK_ENTRY(entry), "0");
gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
gtk_widget_set_usize(entry, 25, -2);
@ -497,7 +497,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
button = gtk_radio_button_new_with_label(
gtk_radio_button_group(GTK_RADIO_BUTTON(button)),
DIALOG_SET_SCALE_MAX_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "col_max_ref", button);
g_object_set_data(G_OBJECT(_dialog), "col_max_ref", button);
gtk_box_pack_end(GTK_BOX(hbox), button, TRUE, FALSE, 5);
gtk_widget_show(button);
@ -509,7 +509,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
gtk_widget_show(hbox);
button = gtk_check_button_new_with_label(DIALOG_SET_SCALE_REF_TOTAL_OPT_LABEL);
gtk_object_set_data(GTK_OBJECT(_dialog), "col_ref_total", button);
g_object_set_data(G_OBJECT(_dialog), "col_ref_total", button);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
gtk_widget_show(button);

12
contrib/prtview/AboutDialog.cpp
View File

@ -57,10 +57,10 @@ void DoAboutDlg(){
gtk_window_set_position( GTK_WINDOW( dlg ),GTK_WIN_POS_CENTER_ON_PARENT );
gtk_window_set_modal( GTK_WINDOW( dlg ), TRUE );
gtk_window_set_title( GTK_WINDOW( dlg ), "About Portal Viewer" );
gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event",
GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( dlg ), "delete_event",
G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( dlg ), "destroy",
G_CALLBACK( gtk_widget_destroy ), NULL );
g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
@ -86,8 +86,8 @@ void DoAboutDlg(){
button = gtk_button_new_with_label( "OK" );
gtk_widget_show( button );
gtk_box_pack_start( GTK_BOX( vbox ), button, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( button ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
gtk_widget_set_usize( button, 60, -2 );
gtk_grab_add( dlg );

62
contrib/prtview/ConfigDialog.cpp
View File

@ -64,14 +64,14 @@ static int DoColor( PackedColour *c ){
gtk_window_set_position( GTK_WINDOW( dlg ),GTK_WIN_POS_CENTER_ON_PARENT );
gtk_window_set_modal( GTK_WINDOW( dlg ), TRUE );
gtk_color_selection_set_current_color( GTK_COLOR_SELECTION( gtk_color_selection_dialog_get_color_selection( GTK_COLOR_SELECTION_DIALOG( dlg ) ) ), &clr );
gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( dlg ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( dlg ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
GtkWidget *ok_button, *cancel_button;
g_object_get( G_OBJECT( dlg ), "ok-button", &ok_button, "cancel-button", &cancel_button, nullptr );
gtk_signal_connect( GTK_OBJECT( ok_button ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
gtk_signal_connect( GTK_OBJECT( cancel_button ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
g_signal_connect( G_OBJECT( ok_button ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
g_signal_connect( G_OBJECT( cancel_button ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
@ -252,10 +252,10 @@ void DoConfigDialog(){
gtk_window_set_position( GTK_WINDOW( dlg ),GTK_WIN_POS_CENTER_ON_PARENT );
gtk_window_set_modal( GTK_WINDOW( dlg ), TRUE );
gtk_window_set_title( GTK_WINDOW( dlg ), "Portal Viewer Configuration" );
gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event",
GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( dlg ), "delete_event",
G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( dlg ), "destroy",
G_CALLBACK( gtk_widget_destroy ), NULL );
g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
@ -286,7 +286,7 @@ void DoConfigDialog(){
lw3label = gtk_label_new( "" );
gtk_widget_show( lw3label );
gtk_box_pack_start( GTK_BOX( hbox ), lw3label, FALSE, TRUE, 0 );
gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScroll3d ), lw3label );
g_signal_connect( adj, "value_changed", G_CALLBACK( OnScroll3d ), lw3label );
table = gtk_table_new( 2, 4, FALSE );
gtk_widget_show( table );
@ -299,42 +299,42 @@ void DoConfigDialog(){
gtk_table_attach( GTK_TABLE( table ), button, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_signal_connect( GTK_OBJECT( button ), "clicked", GTK_SIGNAL_FUNC( OnColor3d ), NULL );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( OnColor3d ), NULL );
button = gtk_button_new_with_label( "Depth Color" );
gtk_widget_show( button );
gtk_table_attach( GTK_TABLE( table ), button, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_signal_connect( GTK_OBJECT( button ), "clicked", GTK_SIGNAL_FUNC( OnColorFog ), NULL );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( OnColorFog ), NULL );
aa3check = gtk_check_button_new_with_label( "Anti-Alias (May not work on some video cards)" );
gtk_widget_show( aa3check );
gtk_table_attach( GTK_TABLE( table ), aa3check, 1, 4, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_signal_connect( GTK_OBJECT( aa3check ), "toggled", GTK_SIGNAL_FUNC( OnAntiAlias3d ), NULL );
g_signal_connect( G_OBJECT( aa3check ), "toggled", G_CALLBACK( OnAntiAlias3d ), NULL );
depthcheck = gtk_check_button_new_with_label( "Depth Cue" );
gtk_widget_show( depthcheck );
gtk_table_attach( GTK_TABLE( table ), depthcheck, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_signal_connect( GTK_OBJECT( depthcheck ), "toggled", GTK_SIGNAL_FUNC( OnFog ), NULL );
g_signal_connect( G_OBJECT( depthcheck ), "toggled", G_CALLBACK( OnFog ), NULL );
linescheck = gtk_check_button_new_with_label( "Lines" );
gtk_widget_show( linescheck );
gtk_table_attach( GTK_TABLE( table ), linescheck, 2, 3, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_signal_connect( GTK_OBJECT( linescheck ), "toggled", GTK_SIGNAL_FUNC( OnLines ), NULL );
g_signal_connect( G_OBJECT( linescheck ), "toggled", G_CALLBACK( OnLines ), NULL );
polyscheck = gtk_check_button_new_with_label( "Polygons" );
gtk_widget_show( polyscheck );
gtk_table_attach( GTK_TABLE( table ), polyscheck, 3, 4, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_signal_connect( GTK_OBJECT( polyscheck ), "toggled", GTK_SIGNAL_FUNC( OnPoly ), NULL );
g_signal_connect( G_OBJECT( polyscheck ), "toggled", G_CALLBACK( OnPoly ), NULL );
zlist = gtk_option_menu_new();
gtk_widget_show( zlist );
@ -346,20 +346,20 @@ void DoConfigDialog(){
item = gtk_menu_item_new_with_label( "Z-Buffer Test and Write (recommended for solid or no polygons)" );
gtk_widget_show( item );
gtk_signal_connect( GTK_OBJECT( item ), "activate",
GTK_SIGNAL_FUNC( OnSelchangeZbuffer ), GINT_TO_POINTER( 0 ) );
g_signal_connect( G_OBJECT( item ), "activate",
G_CALLBACK( OnSelchangeZbuffer ), GINT_TO_POINTER( 0 ) );
gtk_menu_append( GTK_MENU( menu ), item );
item = gtk_menu_item_new_with_label( "Z-Buffer Test Only (recommended for transparent polygons)" );
gtk_widget_show( item );
gtk_signal_connect( GTK_OBJECT( item ), "activate",
GTK_SIGNAL_FUNC( OnSelchangeZbuffer ), GINT_TO_POINTER( 1 ) );
g_signal_connect( G_OBJECT( item ), "activate",
G_CALLBACK( OnSelchangeZbuffer ), GINT_TO_POINTER( 1 ) );
gtk_menu_append( GTK_MENU( menu ), item );
item = gtk_menu_item_new_with_label( "Z-Buffer Off" );
gtk_widget_show( item );
gtk_signal_connect( GTK_OBJECT( item ), "activate",
GTK_SIGNAL_FUNC( OnSelchangeZbuffer ), GINT_TO_POINTER( 2 ) );
g_signal_connect( G_OBJECT( item ), "activate",
G_CALLBACK( OnSelchangeZbuffer ), GINT_TO_POINTER( 2 ) );
gtk_menu_append( GTK_MENU( menu ), item );
table = gtk_table_new( 2, 2, FALSE );
@ -382,7 +382,7 @@ void DoConfigDialog(){
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( translabel ), 0.0, 0.0 );
gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScrollTrans ), translabel );
g_signal_connect( adj, "value_changed", G_CALLBACK( OnScrollTrans ), translabel );
adj = gtk_adjustment_new( portals.clip_range, 1, 128, 1, 1, 0 );
clipslider = gtk_hscale_new( GTK_ADJUSTMENT( adj ) );
@ -398,7 +398,7 @@ void DoConfigDialog(){
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( cliplabel ), 0.0, 0.0 );
gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScrollClip ), cliplabel );
g_signal_connect( adj, "value_changed", G_CALLBACK( OnScrollClip ), cliplabel );
hbox = gtk_hbox_new( TRUE, 5 );
gtk_widget_show( hbox );
@ -407,12 +407,12 @@ void DoConfigDialog(){
show3check = gtk_check_button_new_with_label( "Show" );
gtk_widget_show( show3check );
gtk_box_pack_start( GTK_BOX( hbox ), show3check, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( show3check ), "toggled", GTK_SIGNAL_FUNC( OnConfig3d ), NULL );
g_signal_connect( G_OBJECT( show3check ), "toggled", G_CALLBACK( OnConfig3d ), NULL );
portalcheck = gtk_check_button_new_with_label( "Portal cubic clipper" );
gtk_widget_show( portalcheck );
gtk_box_pack_start( GTK_BOX( hbox ), portalcheck, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( portalcheck ), "toggled", GTK_SIGNAL_FUNC( OnClip ), NULL );
g_signal_connect( G_OBJECT( portalcheck ), "toggled", G_CALLBACK( OnClip ), NULL );
frame = gtk_frame_new( "2D View" );
gtk_widget_show( frame );
@ -436,7 +436,7 @@ void DoConfigDialog(){
lw2label = gtk_label_new( "" );
gtk_widget_show( lw2label );
gtk_box_pack_start( GTK_BOX( hbox ), lw2label, FALSE, TRUE, 0 );
gtk_signal_connect( adj, "value_changed", GTK_SIGNAL_FUNC( OnScroll2d ), lw2label );
g_signal_connect( adj, "value_changed", G_CALLBACK( OnScroll2d ), lw2label );
hbox = gtk_hbox_new( FALSE, 5 );
gtk_widget_show( hbox );
@ -445,13 +445,13 @@ void DoConfigDialog(){
button = gtk_button_new_with_label( "Color" );
gtk_widget_show( button );
gtk_box_pack_start( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( button ), "clicked", GTK_SIGNAL_FUNC( OnColor2d ), NULL );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( OnColor2d ), NULL );
gtk_widget_set_usize( button, 60, -2 );
aa2check = gtk_check_button_new_with_label( "Anti-Alias (May not work on some video cards)" );
gtk_widget_show( aa2check );
gtk_box_pack_start( GTK_BOX( hbox ), aa2check, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( aa2check ), "toggled", GTK_SIGNAL_FUNC( OnAntiAlias2d ), NULL );
g_signal_connect( G_OBJECT( aa2check ), "toggled", G_CALLBACK( OnAntiAlias2d ), NULL );
hbox = gtk_hbox_new( FALSE, 5 );
gtk_widget_show( hbox );
@ -460,7 +460,7 @@ void DoConfigDialog(){
show2check = gtk_check_button_new_with_label( "Show" );
gtk_widget_show( show2check );
gtk_box_pack_start( GTK_BOX( hbox ), show2check, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( show2check ), "toggled", GTK_SIGNAL_FUNC( OnConfig2d ), NULL );
g_signal_connect( G_OBJECT( show2check ), "toggled", G_CALLBACK( OnConfig2d ), NULL );
hbox = gtk_hbox_new( FALSE, 5 );
gtk_widget_show( hbox );
@ -469,8 +469,8 @@ void DoConfigDialog(){
button = gtk_button_new_with_label( "OK" );
gtk_widget_show( button );
gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( button ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
gtk_widget_set_usize( button, 60, -2 );
// initialize dialog

30
contrib/prtview/LoadPortalFileDialog.cpp
View File

@ -79,12 +79,12 @@ static void change_clicked( GtkWidget *widget, gpointer data ){
gtk_window_set_transient_for( GTK_WINDOW( file_sel ), GTK_WINDOW( g_pRadiantWnd ) );
gtk_window_set_position( GTK_WINDOW( file_sel ),GTK_WIN_POS_CENTER_ON_PARENT );
gtk_window_set_modal( GTK_WINDOW( file_sel ), TRUE );
gtk_signal_connect( GTK_OBJECT( GTK_FILE_SELECTION( file_sel )->ok_button ), "clicked",
GTK_SIGNAL_FUNC( file_sel_callback ), GINT_TO_POINTER( IDOK ) );
gtk_signal_connect( GTK_OBJECT( GTK_FILE_SELECTION( file_sel )->cancel_button ), "clicked",
GTK_SIGNAL_FUNC( file_sel_callback ), GINT_TO_POINTER( IDCANCEL ) );
gtk_signal_connect( GTK_OBJECT( file_sel ), "delete_event",
GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( GTK_FILE_SELECTION( file_sel )->ok_button ), "clicked",
G_CALLBACK( file_sel_callback ), GINT_TO_POINTER( IDOK ) );
g_signal_connect( G_OBJECT( GTK_FILE_SELECTION( file_sel )->cancel_button ), "clicked",
G_CALLBACK( file_sel_callback ), GINT_TO_POINTER( IDCANCEL ) );
g_signal_connect( G_OBJECT( file_sel ), "delete_event",
G_CALLBACK( dialog_delete_callback ), NULL );
gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION( file_sel ) );
g_object_set_data( G_OBJECT( file_sel ), "loop", &loop );
@ -121,10 +121,10 @@ int DoLoadPortalFileDialog(){
gtk_window_set_position( GTK_WINDOW( dlg ),GTK_WIN_POS_CENTER_ON_PARENT );
gtk_window_set_modal( GTK_WINDOW( dlg ), TRUE );
gtk_window_set_title( GTK_WINDOW( dlg ), "Load .prt" );
gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event",
GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( dlg ), "delete_event",
G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( dlg ), "destroy",
G_CALLBACK( gtk_widget_destroy ), NULL );
g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
@ -153,7 +153,7 @@ int DoLoadPortalFileDialog(){
button = gtk_button_new_with_label( "Change" );
gtk_widget_show( button );
gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( button ), "clicked", GTK_SIGNAL_FUNC( change_clicked ), entry );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( change_clicked ), entry );
gtk_widget_set_usize( button, 60, -2 );
hbox = gtk_hbox_new( FALSE, 5 );
@ -163,15 +163,15 @@ int DoLoadPortalFileDialog(){
button = gtk_button_new_with_label( "Cancel" );
gtk_widget_show( button );
gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( button ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
gtk_widget_set_usize( button, 60, -2 );
button = gtk_button_new_with_label( "OK" );
gtk_widget_show( button );
gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
gtk_signal_connect( GTK_OBJECT( button ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
gtk_widget_set_usize( button, 60, -2 );
strcpy( portals.fn, GlobalRadiant().getMapName() );

8
plugins/textool/2DView.cpp
View File

@ -117,22 +117,22 @@ bool C2DView::OnRButtonUp( int x, int y ){
menu = gtk_menu_new();
item = gtk_menu_item_new_with_label( "Validate (RETURN)" );
gtk_signal_connect( GTK_OBJECT( item ), "activate", GTK_SIGNAL_FUNC( Textool_Validate ), NULL );
g_signal_connect( G_OBJECT( item ), "activate", G_CALLBACK( Textool_Validate ), NULL );
gtk_widget_show( item );
gtk_menu_append( GTK_MENU( menu ), item );
item = gtk_menu_item_new_with_label( "Zoom in (INSERT)" );
gtk_signal_connect( GTK_OBJECT( item ), "activate", GTK_SIGNAL_FUNC( view_ZoomIn ), this );
g_signal_connect( G_OBJECT( item ), "activate", G_CALLBACK( view_ZoomIn ), this );
gtk_widget_show( item );
gtk_menu_append( GTK_MENU( menu ), item );
item = gtk_menu_item_new_with_label( "Zoom out (DELETE)" );
gtk_signal_connect( GTK_OBJECT( item ), "activate", GTK_SIGNAL_FUNC( view_ZoomOut ), this );
g_signal_connect( G_OBJECT( item ), "activate", G_CALLBACK( view_ZoomOut ), this );
gtk_widget_show( item );
gtk_menu_append( GTK_MENU( menu ), item );
item = gtk_menu_item_new_with_label( "Cancel (ESC)" );
gtk_signal_connect( GTK_OBJECT( item ), "activate", GTK_SIGNAL_FUNC( Textool_Cancel ), NULL );
g_signal_connect( G_OBJECT( item ), "activate", G_CALLBACK( Textool_Cancel ), NULL );
gtk_widget_show( item );
gtk_menu_append( GTK_MENU( menu ), item );

60
plugins/textool/TexTool.cpp
View File

@ -55,10 +55,10 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
int mode = ( uType & MB_TYPEMASK ), ret, loop = 1;
window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_signal_connect( GTK_OBJECT( window ), "delete_event",
GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
gtk_signal_connect( GTK_OBJECT( window ), "destroy",
GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
g_signal_connect( G_OBJECT( window ), "delete_event",
G_CALLBACK( dialog_delete_callback ), NULL );
g_signal_connect( G_OBJECT( window ), "destroy",
G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), lpCaption );
gtk_container_border_width( GTK_CONTAINER( window ), 10 );
g_object_set_data( G_OBJECT( window ), "loop", &loop );
@ -85,8 +85,8 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
if ( mode == MB_OK ) {
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
@ -95,38 +95,38 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
else if ( mode == MB_OKCANCEL ) {
w = gtk_button_new_with_label( "Ok" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
gtk_widget_show( w );
ret = IDCANCEL;
}
else if ( mode == MB_YESNOCANCEL ) {
w = gtk_button_new_with_label( "Yes" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDYES ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDYES ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
w = gtk_button_new_with_label( "No" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDNO ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDNO ) );
gtk_widget_show( w );
w = gtk_button_new_with_label( "Cancel" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
gtk_widget_show( w );
ret = IDCANCEL;
}
@ -134,16 +134,16 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
{
w = gtk_button_new_with_label( "Yes" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDYES ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDYES ) );
gtk_widget_set_can_default( w, TRUE );
gtk_widget_grab_default( w );
gtk_widget_show( w );
w = gtk_button_new_with_label( "No" );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_signal_connect( GTK_OBJECT( w ), "clicked",
GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDNO ) );
g_signal_connect( G_OBJECT( w ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDNO ) );
gtk_widget_show( w );
ret = IDNO;
}
@ -643,17 +643,17 @@ static GtkWidget* CreateOpenGLWidget(){
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK );
// Connect signal handlers
gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "expose_event", GTK_SIGNAL_FUNC( expose ), NULL );
gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "motion_notify_event",
GTK_SIGNAL_FUNC( motion ), NULL );
gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "button_press_event",
GTK_SIGNAL_FUNC( button_press ), NULL );
gtk_signal_connect( GTK_OBJECT( g_pToolWidget ), "button_release_event",
GTK_SIGNAL_FUNC( button_release ), NULL );
g_signal_connect( G_OBJECT( g_pToolWidget ), "expose_event", G_CALLBACK( expose ), NULL );
g_signal_connect( G_OBJECT( g_pToolWidget ), "motion_notify_event",
G_CALLBACK( motion ), NULL );
g_signal_connect( G_OBJECT( g_pToolWidget ), "button_press_event",
G_CALLBACK( button_press ), NULL );
g_signal_connect( G_OBJECT( g_pToolWidget ), "button_release_event",
G_CALLBACK( button_release ), NULL );
gtk_signal_connect( GTK_OBJECT( g_pToolWnd ), "delete_event", GTK_SIGNAL_FUNC( close ), NULL );
gtk_signal_connect( GTK_OBJECT( g_pToolWnd ), "key_press_event",
GTK_SIGNAL_FUNC( keypress ), NULL );
g_signal_connect( G_OBJECT( g_pToolWnd ), "delete_event", G_CALLBACK( close ), NULL );
g_signal_connect( G_OBJECT( g_pToolWnd ), "key_press_event",
G_CALLBACK( keypress ), NULL );
return g_pToolWidget;
}

6
radiant/plugintoolbar.cpp
View File

@ -81,8 +81,8 @@ inline GtkToolbarChildType gtktoolbarchildtype_for_toolbarbuttontype( IToolbarBu
return (GtkToolbarChildType)0;
}
void toolbar_insert( GtkToolbar *toolbar, const char* icon, const char* text, const char* tooltip, IToolbarButton::EType type, GtkSignalFunc handler, gpointer data ){
GtkWidget* widget = gtk_toolbar_append_element( toolbar, gtktoolbarchildtype_for_toolbarbuttontype( type ), 0, text, tooltip, "", GTK_WIDGET( new_plugin_image( icon ) ), handler, data );
void toolbar_insert( GtkToolbar *toolbar, const char* icon, const char* text, const char* tooltip, IToolbarButton::EType type, GCallback callback, gpointer data ){
GtkWidget* widget = gtk_toolbar_append_element( toolbar, gtktoolbarchildtype_for_toolbarbuttontype( type ), 0, text, tooltip, "", GTK_WIDGET( new_plugin_image( icon ) ), callback, data );
if( type != IToolbarButton::eSpace ){
gtk_widget_set_can_focus( widget, FALSE );
gtk_widget_set_can_default( widget, FALSE );
@ -94,7 +94,7 @@ void ActivateToolbarButton( GtkWidget *widget, gpointer data ){
}
void PlugInToolbar_AddButton( GtkToolbar* toolbar, const IToolbarButton* button ){
toolbar_insert( toolbar, button->getImage(), button->getText(), button->getTooltip(), button->getType(), GTK_SIGNAL_FUNC( ActivateToolbarButton ), reinterpret_cast<gpointer>( const_cast<IToolbarButton*>( button ) ) );
toolbar_insert( toolbar, button->getImage(), button->getText(), button->getTooltip(), button->getType(), G_CALLBACK( ActivateToolbarButton ), reinterpret_cast<gpointer>( const_cast<IToolbarButton*>( button ) ) );
}
GtkToolbar* g_plugin_toolbar = 0;