---------------------------------*/
typedef struct {
- GtkWidget *cbTexChange;
- GtkWidget *editTexOld, *editTexNew;
+ ui::Widget cbTexChange{ui::null};
+ ui::Widget editTexOld{ui::null}, editTexNew{ui::null};
- GtkWidget *cbScaleHor, *cbScaleVert;
- GtkWidget *editScaleHor, *editScaleVert;
+ ui::Widget cbScaleHor{ui::null}, cbScaleVert{ui::null};
+ ui::Widget editScaleHor{ui::null}, editScaleVert{ui::null};
- GtkWidget *cbShiftHor, *cbShiftVert;
- GtkWidget *editShiftHor, *editShiftVert;
+ ui::Widget cbShiftHor{ui::null}, cbShiftVert{ui::null};
+ ui::Widget editShiftHor{ui::null}, editShiftVert{ui::null};
- GtkWidget *cbRotation;
- GtkWidget *editRotation;
+ ui::Widget cbRotation{ui::null};
+ ui::Widget editRotation{ui::null};
}dlg_texReset_t;
dlg_texReset_t dlgTexReset;
*ret = (EMessageBoxReturn)gpointer_to_int( data );
}
-static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){
- int *loop;
-
- gtk_widget_hide( widget );
- loop = (int*)g_object_get_data( G_OBJECT( widget ), "loop" );
+static gint dialog_delete_callback( ui::Widget widget, GdkEvent* event, gpointer data ){
+ widget.hide();
+ int *loop = (int *) g_object_get_data(G_OBJECT(widget), "loop");
*loop = 0;
-
return TRUE;
}
Data validation Routines
---------------------------------*/
-bool ValidateTextFloat( const char* pData, char* error_title, float* value ){
+bool ValidateTextFloat( const char* pData, const char* error_title, float* value ){
if ( pData ) {
float testNum = (float)atof( pData );
return FALSE;
}
-bool ValidateTextFloatRange( const char* pData, float min, float max, char* error_title, float* value ){
+bool ValidateTextFloatRange( const char* pData, float min, float max, const char* error_title, float* value ){
char error_buffer[256];
sprintf( error_buffer, "Please Enter A Floating Point Number Between %.3f and %.3f", min, max );
return FALSE;
}
-bool ValidateTextIntRange( const char* pData, int min, int max, char* error_title, int* value ){
+bool ValidateTextIntRange( const char* pData, int min, int max, const char* error_title, int* value ){
char error_buffer[256];
sprintf( error_buffer, "Please Enter An Integer Between %i and %i", min, max );
return FALSE;
}
-bool ValidateTextInt( const char* pData, char* error_title, int* value ){
+bool ValidateTextInt( const char* pData, const char* error_title, int* value ){
if ( pData ) {
int testNum = atoi( pData );
*/
EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMessageBoxType type ){
- ui::Widget w, vbox, hbox;
+ ui::Widget w{ui::null};
EMessageBoxReturn ret;
int loop = 1;
auto window = ui::Window( ui::window_type::TOP );
- g_signal_connect( GTK_OBJECT( window ), "delete_event",
- G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( window ), "destroy",
- G_CALLBACK( gtk_widget_destroy ), NULL );
+ window.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
+ window.connect( "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), lpCaption );
gtk_container_set_border_width( GTK_CONTAINER( window ), 10 );
g_object_set_data( G_OBJECT( window ), "loop", &loop );
g_object_set_data( G_OBJECT( window ), "ret", &ret );
gtk_widget_realize( window );
- vbox = ui::VBox( FALSE, 10 );
+ auto vbox = ui::VBox( FALSE, 10 );
window.add(vbox);
gtk_widget_show( vbox );
w = ui::Label( lpText );
- gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 2 );
+ vbox.pack_start( w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_widget_show( w );
w = ui::Widget(gtk_hseparator_new());
- gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 2 );
+ vbox.pack_start( w, FALSE, FALSE, 2 );
gtk_widget_show( w );
- hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 2 );
+ auto hbox = ui::HBox( FALSE, 10 );
+ vbox.pack_start( hbox, FALSE, FALSE, 2 );
gtk_widget_show( hbox );
if ( type == eMB_OK ) {
w = ui::Button( "Ok" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked",
- G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "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 );
}
else if ( type == eMB_OKCANCEL ) {
w = ui::Button( "Ok" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked",
- G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "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 = ui::Button( "Cancel" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked",
- G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
}
else if ( type == eMB_YESNOCANCEL ) {
w = ui::Button( "Yes" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked",
- G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "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 = ui::Button( "No" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked",
- G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) );
gtk_widget_show( w );
w = ui::Button( "Cancel" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked",
- G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
}
else /* if (mode == MB_YESNO) */
{
w = ui::Button( "Yes" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked",
- G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "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 = ui::Button( "No" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked",
- G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) );
gtk_widget_show( w );
ret = eIDNO;
}
gtk_main_iteration();
gtk_grab_remove( window );
- gtk_widget_destroy( window );
+ window.destroy();
return ret;
}
EMessageBoxReturn DoIntersectBox( IntersectRS* rs ){
- GtkWidget *w, *hbox;
- GtkWidget *check1, *check2;
EMessageBoxReturn ret;
int loop = 1;
auto window = ui::Window( ui::window_type::TOP );
- g_signal_connect( GTK_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
+ window.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
+ window.connect( "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Intersect" );
gtk_container_set_border_width( GTK_CONTAINER( window ), 10 );
// ---- vbox ----
- auto radio1 = gtk_radio_button_new_with_label( NULL, "Use Whole Map" );
- gtk_box_pack_start( GTK_BOX( vbox ), radio1, FALSE, FALSE, 2 );
+ auto radio1 = ui::Widget(gtk_radio_button_new_with_label( NULL, "Use Whole Map" ));
+ vbox.pack_start( radio1, FALSE, FALSE, 2 );
gtk_widget_show( radio1 );
- auto radio2 = gtk_radio_button_new_with_label( gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio1)), "Use Selected Brushes" );
- gtk_box_pack_start( GTK_BOX( vbox ), radio2, FALSE, FALSE, 2 );
+ auto radio2 = ui::Widget(gtk_radio_button_new_with_label( gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio1)), "Use Selected Brushes" ));
+ vbox.pack_start( radio2, FALSE, FALSE, 2 );
gtk_widget_show( radio2 );
- w = gtk_hseparator_new();
- gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 2 );
- gtk_widget_show( w );
+ auto hsep = ui::Widget(gtk_hseparator_new());
+ vbox.pack_start( hsep, FALSE, FALSE, 2 );
+ hsep.show();
- check1 = ui::CheckButton( "Include Detail Brushes" );
- gtk_box_pack_start( GTK_BOX( vbox ), check1, FALSE, FALSE, 0 );
+ auto check1 = ui::CheckButton( "Include Detail Brushes" );
+ vbox.pack_start( check1, FALSE, FALSE, 0 );
gtk_widget_show( check1 );
- check2 = ui::CheckButton( "Select Duplicate Brushes Only" );
- gtk_box_pack_start( GTK_BOX( vbox ), check2, FALSE, FALSE, 0 );
+ auto check2 = ui::CheckButton( "Select Duplicate Brushes Only" );
+ vbox.pack_start( check2, FALSE, FALSE, 0 );
gtk_widget_show( check2 );
- hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 2 );
+ auto hbox = ui::HBox( FALSE, 10 );
+ vbox.pack_start( hbox, FALSE, FALSE, 2 );
gtk_widget_show( hbox );
// ---- hbox ---- ok/cancel buttons
- w = ui::Button( "Ok" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
+ auto w = ui::Button( "Ok" );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "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 = ui::Button( "Cancel" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
while ( loop )
gtk_main_iteration();
- if ( gtk_toggle_button_get_active( (GtkToggleButton*)radio1 ) ) {
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(radio1) ) ) {
rs->nBrushOptions = BRUSH_OPT_WHOLE_MAP;
}
- else if ( gtk_toggle_button_get_active( (GtkToggleButton*)radio2 ) ) {
+ else if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(radio2) ) ) {
rs->nBrushOptions = BRUSH_OPT_SELECTED;
}
- rs->bUseDetail = gtk_toggle_button_get_active( (GtkToggleButton*)check1 ) ? true : false;
- rs->bDuplicateOnly = gtk_toggle_button_get_active( (GtkToggleButton*)check2 ) ? true : false;
+ rs->bUseDetail = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(check1) ) ? true : false;
+ rs->bDuplicateOnly = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(check2) ) ? true : false;
gtk_grab_remove( window );
- gtk_widget_destroy( window );
+ window.destroy();
return ret;
}
EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){
- GtkWidget *w, *hbox, *vbox2, *hbox2;
-
- GtkWidget *check1, *check2, *check3;
- GtkWidget *text1, *text2;
-
EMessageBoxReturn ret;
int loop = 1;
auto window = ui::Window( ui::window_type::TOP );
- g_signal_connect( GTK_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
+ window.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
+ window.connect( "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Polygon Builder" );
gtk_container_set_border_width( GTK_CONTAINER( window ), 10 );
// ---- vbox ----
- hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 2 );
+ auto hbox = ui::HBox( FALSE, 10 );
+ vbox.pack_start( hbox, FALSE, FALSE, 2 );
gtk_widget_show( hbox );
// ---- hbox ----
- vbox2 = ui::VBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( hbox ), vbox2, FALSE, FALSE, 2 );
+ auto vbox2 = ui::VBox( FALSE, 10 );
+ hbox.pack_start( vbox2, FALSE, FALSE, 2 );
gtk_widget_show( vbox2 );
// ---- vbox2 ----
- hbox2 = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox2 ), hbox2, FALSE, FALSE, 2 );
+ auto hbox2 = ui::HBox( FALSE, 10 );
+ vbox2.pack_start( hbox2, FALSE, FALSE, 2 );
gtk_widget_show( hbox2 );
// ---- hbox2 ----
- text1 = ui::Entry( 256 );
+ auto text1 = ui::Entry( 256 );
gtk_entry_set_text( (GtkEntry*)text1, "3" );
- gtk_box_pack_start( GTK_BOX( hbox2 ), text1, FALSE, FALSE, 2 );
+ hbox2.pack_start( text1, FALSE, FALSE, 2 );
gtk_widget_show( text1 );
- w = ui::Label( "Number Of Sides" );
- gtk_box_pack_start( GTK_BOX( hbox2 ), w, FALSE, FALSE, 2 );
- gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
- gtk_widget_show( w );
+ auto l = ui::Label( "Number Of Sides" );
+ hbox2.pack_start( l, FALSE, FALSE, 2 );
+ gtk_label_set_justify( GTK_LABEL( l ), GTK_JUSTIFY_LEFT );
+ gtk_widget_show( l );
// ---- /hbox2 ----
hbox2 = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox2 ), hbox2, FALSE, FALSE, 2 );
+ vbox2.pack_start( hbox2, FALSE, FALSE, 2 );
gtk_widget_show( hbox2 );
// ---- hbox2 ----
- text2 = ui::Entry( 256 );
+ auto text2 = ui::Entry( 256 );
gtk_entry_set_text( (GtkEntry*)text2, "8" );
- gtk_box_pack_start( GTK_BOX( hbox2 ), text2, FALSE, FALSE, 2 );
+ hbox2.pack_start( text2, FALSE, FALSE, 2 );
gtk_widget_show( text2 );
- w = ui::Label( "Border Width" );
- gtk_box_pack_start( GTK_BOX( hbox2 ), w, FALSE, FALSE, 2 );
- gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
- gtk_widget_show( w );
+ l = ui::Label( "Border Width" );
+ hbox2.pack_start( l, FALSE, FALSE, 2 );
+ gtk_label_set_justify( GTK_LABEL( l ), GTK_JUSTIFY_LEFT );
+ gtk_widget_show( l );
// ---- /hbox2 ----
vbox2 = ui::VBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( hbox ), vbox2, FALSE, FALSE, 2 );
+ hbox.pack_start( vbox2, FALSE, FALSE, 2 );
gtk_widget_show( vbox2 );
// ---- vbox2 ----
- check1 = ui::CheckButton( "Use Border" );
- gtk_box_pack_start( GTK_BOX( vbox2 ), check1, FALSE, FALSE, 0 );
+ auto check1 = ui::CheckButton( "Use Border" );
+ vbox2.pack_start( check1, FALSE, FALSE, 0 );
gtk_widget_show( check1 );
- check2 = ui::CheckButton( "Inverse Polygon" );
- gtk_box_pack_start( GTK_BOX( vbox2 ), check2, FALSE, FALSE, 0 );
+ auto check2 = ui::CheckButton( "Inverse Polygon" );
+ vbox2.pack_start( check2, FALSE, FALSE, 0 );
gtk_widget_show( check2 );
- check3 = ui::CheckButton( "Align Top Edge" );
- gtk_box_pack_start( GTK_BOX( vbox2 ), check3, FALSE, FALSE, 0 );
+ auto check3 = ui::CheckButton( "Align Top Edge" );
+ vbox2.pack_start( check3, FALSE, FALSE, 0 );
gtk_widget_show( check3 );
// ---- /vbox2 ----
// ---- /hbox ----
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 2 );
+ vbox.pack_start( hbox, FALSE, FALSE, 2 );
gtk_widget_show( hbox );
// ---- hbox ----
- w = ui::Button( "Ok" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
+ auto w = ui::Button( "Ok" );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "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 = ui::Button( "Cancel" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
dialogError = FALSE;
if ( ret == eIDOK ) {
- rs->bUseBorder = gtk_toggle_button_get_active( (GtkToggleButton*)check1 ) ? true : false;
- rs->bInverse = gtk_toggle_button_get_active( (GtkToggleButton*)check2 ) ? true : false;
- rs->bAlignTop = gtk_toggle_button_get_active( (GtkToggleButton*)check3 ) ? true : false;
+ rs->bUseBorder = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(check1) ) ? true : false;
+ rs->bInverse = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(check2) ) ? true : false;
+ rs->bAlignTop = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(check3) ) ? true : false;
if ( !ValidateTextIntRange( gtk_entry_get_text( (GtkEntry*)text1 ), 3, 32, "Number Of Sides", &rs->nSides ) ) {
dialogError = TRUE;
}
gtk_grab_remove( window );
- gtk_widget_destroy( window );
+ window.destroy();
return ret;
}
// for stair builder stuck as close as i could to the MFC version
// obviously feel free to change it at will :)
EMessageBoxReturn DoBuildStairsBox( BuildStairsRS* rs ){
- GtkWidget *w;
- GtkWidget *textStairHeight, *textRiserTex, *textMainTex;
- GtkWidget *radioNorth, *radioSouth, *radioEast, *radioWest; // i'm guessing we can't just abuse 'w' for these if we're getting a value
- GtkWidget *radioOldStyle, *radioBobStyle, *radioCornerStyle;
- GtkWidget *checkUseDetail;
GSList *radioDirection, *radioStyle;
EMessageBoxReturn ret;
int loop = 1;
- char *text = "Please set a value in the boxes below and press 'OK' to build the stairs";
+ const char *text = "Please set a value in the boxes below and press 'OK' to build the stairs";
auto window = ui::Window( ui::window_type::TOP );
- g_signal_connect( GTK_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
+ window.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
+ window.connect( "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Stair Builder" );
gtk_widget_show( hbox );
// dunno if you want this text or not ...
- w = ui::Label( text );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 ); // not entirely sure on all the parameters / what they do ...
+ ui::Widget w = ui::Label( text );
+ hbox.pack_start( w, FALSE, FALSE, 0 ); // not entirely sure on all the parameters / what they do ...
gtk_widget_show( w );
- w = gtk_hseparator_new();
- gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
+ w = ui::Widget(gtk_hseparator_new());
+ vbox.pack_start( w, FALSE, FALSE, 0 );
gtk_widget_show( w );
// ------------------------- // indenting == good way of keeping track of lines :)
// new hbox
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
- textStairHeight = ui::Entry( 256 );
- gtk_box_pack_start( GTK_BOX( hbox ), textStairHeight, FALSE, FALSE, 1 );
+ auto textStairHeight = ui::Entry( 256 );
+ hbox.pack_start( textStairHeight, FALSE, FALSE, 1 );
gtk_widget_show( textStairHeight );
w = ui::Label( "Stair Height" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 1 );
+ hbox.pack_start( w, FALSE, FALSE, 1 );
gtk_widget_show( w );
// ------------------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
w = ui::Label( "Direction:" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 5 );
+ hbox.pack_start( w, FALSE, FALSE, 5 );
gtk_widget_show( w );
// -------------------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
// radio buttons confuse me ...
// djbob: actually it looks very nice :), slightly better than the way i did it
// edit: actually it doesn't work :P, you must pass the last radio item each time, ugh
- radioNorth = gtk_radio_button_new_with_label( NULL, "North" );
- gtk_box_pack_start( GTK_BOX( hbox ), radioNorth, FALSE, FALSE, 3 );
+ auto radioNorth = ui::Widget(gtk_radio_button_new_with_label( NULL, "North" ));
+ hbox.pack_start( radioNorth, FALSE, FALSE, 3 );
gtk_widget_show( radioNorth );
radioDirection = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radioNorth ) );
- radioSouth = gtk_radio_button_new_with_label( radioDirection, "South" );
- gtk_box_pack_start( GTK_BOX( hbox ), radioSouth, FALSE, FALSE, 2 );
+ auto radioSouth = ui::Widget(gtk_radio_button_new_with_label( radioDirection, "South" ));
+ hbox.pack_start( radioSouth, FALSE, FALSE, 2 );
gtk_widget_show( radioSouth );
radioDirection = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radioSouth ) );
- radioEast = gtk_radio_button_new_with_label( radioDirection, "East" );
- gtk_box_pack_start( GTK_BOX( hbox ), radioEast, FALSE, FALSE, 1 );
+ auto radioEast = ui::Widget(gtk_radio_button_new_with_label( radioDirection, "East" ));
+ hbox.pack_start( radioEast, FALSE, FALSE, 1 );
gtk_widget_show( radioEast );
radioDirection = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radioEast ) );
- radioWest = gtk_radio_button_new_with_label( radioDirection, "West" );
- gtk_box_pack_start( GTK_BOX( hbox ), radioWest, FALSE, FALSE, 0 );
+ auto radioWest = ui::Widget(gtk_radio_button_new_with_label( radioDirection, "West" ));
+ hbox.pack_start( radioWest, FALSE, FALSE, 0 );
gtk_widget_show( radioWest );
// --------------------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
w = ui::Label( "Style:" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 5 );
+ hbox.pack_start( w, FALSE, FALSE, 5 );
gtk_widget_show( w );
// --------------------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
- radioOldStyle = gtk_radio_button_new_with_label( NULL, "Original" );
- gtk_box_pack_start( GTK_BOX( hbox ), radioOldStyle, FALSE, FALSE, 0 );
+ auto radioOldStyle = ui::Widget(gtk_radio_button_new_with_label( NULL, "Original" ));
+ hbox.pack_start( radioOldStyle, FALSE, FALSE, 0 );
gtk_widget_show( radioOldStyle );
radioStyle = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radioOldStyle ) );
- radioBobStyle = gtk_radio_button_new_with_label( radioStyle, "Bob's Style" );
- gtk_box_pack_start( GTK_BOX( hbox ), radioBobStyle, FALSE, FALSE, 0 );
+ auto radioBobStyle = ui::Widget(gtk_radio_button_new_with_label( radioStyle, "Bob's Style" ));
+ hbox.pack_start( radioBobStyle, FALSE, FALSE, 0 );
gtk_widget_show( radioBobStyle );
radioStyle = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radioBobStyle ) );
- radioCornerStyle = gtk_radio_button_new_with_label( radioStyle, "Corner Style" );
- gtk_box_pack_start( GTK_BOX( hbox ), radioCornerStyle, FALSE, FALSE, 0 );
+ auto radioCornerStyle = ui::Widget(gtk_radio_button_new_with_label( radioStyle, "Corner Style" ));
+ hbox.pack_start( radioCornerStyle, FALSE, FALSE, 0 );
gtk_widget_show( radioCornerStyle );
// err, the q3r has an if or something so you need bob style checked before this
// djbob: think we need some button callback functions or smuffin
// FIXME: actually get around to doing what i suggested!!!!
- checkUseDetail = ui::CheckButton( "Use Detail Brushes" );
- gtk_box_pack_start( GTK_BOX( hbox ), checkUseDetail, FALSE, FALSE, 0 );
+ auto checkUseDetail = ui::CheckButton( "Use Detail Brushes" );
+ hbox.pack_start( checkUseDetail, FALSE, FALSE, 0 );
gtk_widget_show( checkUseDetail );
// --------------------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
- textMainTex = ui::Entry( 512 );
+ auto textMainTex = ui::Entry( 512 );
gtk_entry_set_text( GTK_ENTRY( textMainTex ), rs->mainTexture );
- gtk_box_pack_start( GTK_BOX( hbox ), textMainTex, FALSE, FALSE, 0 );
+ hbox.pack_start( textMainTex, FALSE, FALSE, 0 );
gtk_widget_show( textMainTex );
w = ui::Label( "Main Texture" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 1 );
+ hbox.pack_start( w, FALSE, FALSE, 1 );
gtk_widget_show( w );
// -------------------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
- textRiserTex = ui::Entry( 512 );
- gtk_box_pack_start( GTK_BOX( hbox ), textRiserTex, FALSE, FALSE, 0 );
+ auto textRiserTex = ui::Entry( 512 );
+ hbox.pack_start( textRiserTex, FALSE, FALSE, 0 );
gtk_widget_show( textRiserTex );
w = ui::Label( "Riser Texture" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 1 );
+ hbox.pack_start( w, FALSE, FALSE, 1 );
gtk_widget_show( w );
// -------------------------- //
- w = gtk_hseparator_new();
- gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
+ w = ui::Widget(gtk_hseparator_new());
+ vbox.pack_start( w, FALSE, FALSE, 0 );
gtk_widget_show( w );
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
w = ui::Button( "OK" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "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 = ui::Button( "Cancel" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
dialogError = FALSE;
if ( ret == eIDOK ) {
- rs->bUseDetail = gtk_toggle_button_get_active( (GtkToggleButton*)checkUseDetail ) ? true : false;
+ rs->bUseDetail = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(checkUseDetail) ) ? true : false;
strcpy( rs->riserTexture, gtk_entry_get_text( (GtkEntry*)textRiserTex ) );
strcpy( rs->mainTexture, gtk_entry_get_text( (GtkEntry*)textMainTex ) );
- if ( gtk_toggle_button_get_active( (GtkToggleButton*)radioNorth ) ) {
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(radioNorth) ) ) {
rs->direction = MOVE_NORTH;
}
- else if ( gtk_toggle_button_get_active( (GtkToggleButton*)radioSouth ) ) {
+ else if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(radioSouth) ) ) {
rs->direction = MOVE_SOUTH;
}
- else if ( gtk_toggle_button_get_active( (GtkToggleButton*)radioEast ) ) {
+ else if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(radioEast) ) ) {
rs->direction = MOVE_EAST;
}
- else if ( gtk_toggle_button_get_active( (GtkToggleButton*)radioWest ) ) {
+ else if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(radioWest) ) ) {
rs->direction = MOVE_WEST;
}
dialogError = TRUE;
}
- if ( gtk_toggle_button_get_active( (GtkToggleButton*)radioOldStyle ) ) {
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(radioOldStyle) ) ) {
rs->style = STYLE_ORIGINAL;
}
- else if ( gtk_toggle_button_get_active( (GtkToggleButton*)radioBobStyle ) ) {
+ else if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(radioBobStyle) ) ) {
rs->style = STYLE_BOB;
}
- else if ( gtk_toggle_button_get_active( (GtkToggleButton*)radioCornerStyle ) ) {
+ else if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(radioCornerStyle) ) ) {
rs->style = STYLE_CORNER;
}
}
}
gtk_grab_remove( window );
- gtk_widget_destroy( window );
+ window.destroy();
return ret;
// -djbob
}
EMessageBoxReturn DoDoorsBox( DoorRS* rs ){
- GtkWidget *hbox, *w;
- GtkWidget *textFrontBackTex, *textTrimTex;
- GtkWidget *checkScaleMainH, *checkScaleMainV, *checkScaleTrimH, *checkScaleTrimV;
- GtkWidget *comboMain, *comboTrim;
- GtkWidget *buttonSetMain, *buttonSetTrim;
- GtkWidget *radioNS, *radioEW;
GSList *radioOrientation;
TwinWidget tw1, tw2;
EMessageBoxReturn ret;
auto window = ui::Window( ui::window_type::TOP );
- g_signal_connect( GTK_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
+ window.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
+ window.connect( "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Door Builder" );
// -------------------------- //
- hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ auto hbox = ui::HBox( FALSE, 10 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
- textFrontBackTex = ui::Entry( 512 );
+ auto textFrontBackTex = ui::Entry( 512 );
gtk_entry_set_text( GTK_ENTRY( textFrontBackTex ), rs->mainTexture );
- gtk_box_pack_start( GTK_BOX( hbox ), textFrontBackTex, FALSE, FALSE, 0 );
+ hbox.pack_start( textFrontBackTex, FALSE, FALSE, 0 );
gtk_widget_show( textFrontBackTex );
- w = ui::Label( "Door Front/Back Texture" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
+ ui::Widget w = ui::Label( "Door Front/Back Texture" );
+ hbox.pack_start( w, FALSE, FALSE, 0 );
gtk_widget_show( w );
// ------------------------ //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
- textTrimTex = ui::Entry( 512 );
- gtk_box_pack_start( GTK_BOX( hbox ), textTrimTex, FALSE, FALSE, 0 );
+ auto textTrimTex = ui::Entry( 512 );
+ hbox.pack_start( textTrimTex, FALSE, FALSE, 0 );
gtk_widget_show( textTrimTex );
w = ui::Label( "Door Trim Texture" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
+ hbox.pack_start( w, FALSE, FALSE, 0 );
gtk_widget_show( w );
// ----------------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
// sp: horizontally ????
// djbob: yes mars, u can spell :]
- checkScaleMainH = ui::CheckButton( "Scale Main Texture Horizontally" );
+ auto checkScaleMainH = ui::CheckButton( "Scale Main Texture Horizontally" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( checkScaleMainH ), TRUE );
- gtk_box_pack_start( GTK_BOX( hbox ), checkScaleMainH, FALSE, FALSE, 0 );
+ hbox.pack_start( checkScaleMainH, FALSE, FALSE, 0 );
gtk_widget_show( checkScaleMainH );
- checkScaleTrimH = ui::CheckButton( "Scale Trim Texture Horizontally" );
+ auto checkScaleTrimH = ui::CheckButton( "Scale Trim Texture Horizontally" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( checkScaleTrimH ), TRUE );
- gtk_box_pack_start( GTK_BOX( hbox ), checkScaleTrimH, FALSE, FALSE, 0 );
+ hbox.pack_start( checkScaleTrimH, FALSE, FALSE, 0 );
gtk_widget_show( checkScaleTrimH );
// ---------------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
- checkScaleMainV = ui::CheckButton( "Scale Main Texture Vertically" );
+ auto checkScaleMainV = ui::CheckButton( "Scale Main Texture Vertically" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( checkScaleMainV ), TRUE );
- gtk_box_pack_start( GTK_BOX( hbox ), checkScaleMainV, FALSE, FALSE, 0 );
+ hbox.pack_start( checkScaleMainV, FALSE, FALSE, 0 );
gtk_widget_show( checkScaleMainV );
- checkScaleTrimV = ui::CheckButton( "Scale Trim Texture Vertically" );
- gtk_box_pack_start( GTK_BOX( hbox ), checkScaleTrimV, FALSE, FALSE, 0 );
+ auto checkScaleTrimV = ui::CheckButton( "Scale Trim Texture Vertically" );
+ hbox.pack_start( checkScaleTrimV, FALSE, FALSE, 0 );
gtk_widget_show( checkScaleTrimV );
// --------------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
// djbob: lists added
- comboMain = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(listMainTextures));
+ auto comboMain = ui::ComboBox(GTK_COMBO_BOX(gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(listMainTextures))));
gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(comboMain), 0);
- gtk_box_pack_start( GTK_BOX( hbox ), comboMain, FALSE, FALSE, 0 );
+ hbox.pack_start( comboMain, FALSE, FALSE, 0 );
gtk_widget_show( comboMain );
tw1.one = textFrontBackTex;
- tw1.two = GTK_COMBO_BOX(comboMain);
+ tw1.two = comboMain;
- buttonSetMain = ui::Button( "Set As Main Texture" );
- g_signal_connect( GTK_OBJECT( buttonSetMain ), "clicked", G_CALLBACK( dialog_button_callback_settex ), &tw1 );
- gtk_box_pack_start( GTK_BOX( hbox ), buttonSetMain, FALSE, FALSE, 0 );
+ auto buttonSetMain = ui::Button( "Set As Main Texture" );
+ buttonSetMain.connect( "clicked", G_CALLBACK( dialog_button_callback_settex ), &tw1 );
+ hbox.pack_start( buttonSetMain, FALSE, FALSE, 0 );
gtk_widget_show( buttonSetMain );
// ------------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
- comboTrim = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(listTrimTextures));
+ auto comboTrim = ui::ComboBox(GTK_COMBO_BOX(gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(listTrimTextures))));
gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(comboMain), 0);
- gtk_box_pack_start( GTK_BOX( hbox ), comboTrim, FALSE, FALSE, 0 );
+ hbox.pack_start( comboTrim, FALSE, FALSE, 0 );
gtk_widget_show( comboTrim );
tw2.one = textTrimTex;
- tw2.two = GTK_COMBO_BOX(comboTrim);
+ tw2.two = comboTrim;
- buttonSetTrim = ui::Button( "Set As Trim Texture" );
- g_signal_connect( GTK_OBJECT( buttonSetTrim ), "clicked", G_CALLBACK( dialog_button_callback_settex ), &tw2 );
- gtk_box_pack_start( GTK_BOX( hbox ), buttonSetTrim, FALSE, FALSE, 0 );
+ auto buttonSetTrim = ui::Button( "Set As Trim Texture" );
+ buttonSetTrim.connect( "clicked", G_CALLBACK( dialog_button_callback_settex ), &tw2 );
+ hbox.pack_start( buttonSetTrim, FALSE, FALSE, 0 );
gtk_widget_show( buttonSetTrim );
// ------------------ //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
w = ui::Label( "Orientation" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
+ hbox.pack_start( w, FALSE, FALSE, 0 );
gtk_widget_show( w );
// argh more radio buttons!
- radioNS = gtk_radio_button_new_with_label( NULL, "North - South" );
- gtk_box_pack_start( GTK_BOX( hbox ), radioNS, FALSE, FALSE, 0 );
+ auto radioNS = ui::Widget(gtk_radio_button_new_with_label( NULL, "North - South" ));
+ hbox.pack_start( radioNS, FALSE, FALSE, 0 );
gtk_widget_show( radioNS );
radioOrientation = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radioNS ) );
- radioEW = gtk_radio_button_new_with_label( radioOrientation, "East - West" );
- gtk_box_pack_start( GTK_BOX( hbox ), radioEW, FALSE, FALSE, 0 );
+ auto radioEW = ui::Widget(gtk_radio_button_new_with_label( radioOrientation, "East - West" ));
+ hbox.pack_start( radioEW, FALSE, FALSE, 0 );
gtk_widget_show( radioEW );
// ----------------- //
- w = gtk_hseparator_new();
- gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
+ w = ui::Widget(gtk_hseparator_new());
+ vbox.pack_start( w, FALSE, FALSE, 0 );
gtk_widget_show( w );
// ----------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
w = ui::Button( "OK" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "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 = ui::Button( "Cancel" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
}
gtk_grab_remove( window );
- gtk_widget_destroy( window );
+ window.destroy();
return ret;
//-djbob
}
EMessageBoxReturn DoPathPlotterBox( PathPlotterRS* rs ){
- GtkWidget *w, *hbox;
-
- GtkWidget *text1, *text2, *text3;
- GtkWidget *check1, *check2;
+ ui::Widget w{ui::null};
EMessageBoxReturn ret;
int loop = 1;
auto window = ui::Window( ui::window_type::TOP );
- g_signal_connect( GTK_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
+ window.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
+ window.connect( "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Texture Reset" );
gtk_container_set_border_width( GTK_CONTAINER( window ), 10 );
// ---- vbox ----
- hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 2 );
+ auto hbox = ui::HBox( FALSE, 10 );
+ vbox.pack_start( hbox, FALSE, FALSE, 2 );
gtk_widget_show( hbox );
// ---- hbox ----
- text1 = ui::Entry( 256 );
- gtk_entry_set_text( (GtkEntry*)text1, "25" );
- gtk_box_pack_start( GTK_BOX( hbox ), text1, FALSE, FALSE, 2 );
+ auto text1 = ui::Entry( 256 );
+ gtk_entry_set_text( text1, "25" );
+ hbox.pack_start( text1, FALSE, FALSE, 2 );
gtk_widget_show( text1 );
w = ui::Label( "Number Of Points" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 2 );
+ hbox.pack_start( w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_widget_show( w );
// ---- /hbox ----
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 2 );
+ vbox.pack_start( hbox, FALSE, FALSE, 2 );
gtk_widget_show( hbox );
// ---- hbox ----
- text2 = ui::Entry( 256 );
- gtk_entry_set_text( (GtkEntry*)text2, "3" );
- gtk_box_pack_start( GTK_BOX( hbox ), text2, FALSE, FALSE, 2 );
+ auto text2 = ui::Entry( 256 );
+ gtk_entry_set_text( text2, "3" );
+ hbox.pack_start( text2, FALSE, FALSE, 2 );
gtk_widget_show( text2 );
w = ui::Label( "Multipler" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 2 );
+ hbox.pack_start( w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_widget_show( w );
// ---- /hbox ----
w = ui::Label( "Path Distance = dist(start -> apex) * multiplier" );
- gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
+ vbox.pack_start( w, FALSE, FALSE, 0 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_widget_show( w );
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 2 );
+ vbox.pack_start( hbox, FALSE, FALSE, 2 );
gtk_widget_show( hbox );
// ---- hbox ----
- text3 = ui::Entry( 256 );
- gtk_entry_set_text( (GtkEntry*)text3, "-800" );
- gtk_box_pack_start( GTK_BOX( hbox ), text3, FALSE, FALSE, 2 );
+ auto text3 = ui::Entry( 256 );
+ gtk_entry_set_text( text3, "-800" );
+ hbox.pack_start( text3, FALSE, FALSE, 2 );
gtk_widget_show( text3 );
w = ui::Label( "Gravity" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 2 );
+ hbox.pack_start( w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_widget_show( w );
// ---- /hbox ----
- w = gtk_hseparator_new();
- gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
+ w = ui::Widget(gtk_hseparator_new());
+ vbox.pack_start( w, FALSE, FALSE, 0 );
gtk_widget_show( w );
- check1 = ui::CheckButton( "No Dynamic Update" );
- gtk_box_pack_start( GTK_BOX( vbox ), check1, FALSE, FALSE, 0 );
+ auto check1 = ui::CheckButton( "No Dynamic Update" );
+ vbox.pack_start( check1, FALSE, FALSE, 0 );
gtk_widget_show( check1 );
- check2 = ui::CheckButton( "Show Bounding Lines" );
- gtk_box_pack_start( GTK_BOX( vbox ), check2, FALSE, FALSE, 0 );
+ auto check2 = ui::CheckButton( "Show Bounding Lines" );
+ vbox.pack_start( check2, FALSE, FALSE, 0 );
gtk_widget_show( check2 );
// ---- /vbox ----
// ----------------- //
- w = gtk_hseparator_new();
- gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
+ w = ui::Widget(gtk_hseparator_new());
+ vbox.pack_start( w, FALSE, FALSE, 0 );
gtk_widget_show( w );
// ----------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
w = ui::Button( "Enable" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
gtk_widget_show( w );
gtk_widget_set_can_default( w, true );
gtk_widget_grab_default( w );
w = ui::Button( "Disable" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDNO ) );
gtk_widget_show( w );
w = ui::Button( "Cancel" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
}
gtk_grab_remove( window );
- gtk_widget_destroy( window );
+ window.destroy();
return ret;
}
EMessageBoxReturn DoCTFColourChangeBox(){
- GtkWidget *w, *hbox;
+ ui::Widget w{ui::null};
EMessageBoxReturn ret;
int loop = 1;
auto window = ui::Window( ui::window_type::TOP );
- g_signal_connect( GTK_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
+ window.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
+ window.connect( "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "CTF Colour Changer" );
gtk_container_set_border_width( GTK_CONTAINER( window ), 10 );
// ---- vbox ----
- hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, TRUE, TRUE, 0 );
+ auto hbox = ui::HBox( FALSE, 10 );
+ vbox.pack_start( hbox, TRUE, TRUE, 0 );
gtk_widget_show( hbox );
// ---- hbox ---- ok/cancel buttons
w = ui::Button( "Red->Blue" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "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 = ui::Button( "Blue->Red" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
gtk_widget_show( w );
w = ui::Button( "Cancel" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
gtk_main_iteration();
gtk_grab_remove( window );
- gtk_widget_destroy( window );
+ window.destroy();
return ret;
}
EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){
Str texSelected;
- GtkWidget *w, *hbox;
+ ui::Widget w{ui::null};
EMessageBoxReturn ret;
int loop = 1;
auto window = ui::Window( ui::window_type::TOP );
- g_signal_connect( GTK_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
+ window.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
+ window.connect( "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Texture Reset" );
gtk_container_set_border_width( GTK_CONTAINER( window ), 10 );
// ---- vbox ----
- hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 2 );
+ auto hbox = ui::HBox( FALSE, 10 );
+ vbox.pack_start( hbox, FALSE, FALSE, 2 );
gtk_widget_show( hbox );
// ---- hbox ----
texSelected += GetCurrentTexture();
w = ui::Label( texSelected );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 2 );
+ hbox.pack_start( w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_widget_show( w );
auto frame = ui::Frame( "Reset Texture Names" );
gtk_widget_show( frame );
- gtk_box_pack_start( GTK_BOX( vbox ), frame, FALSE, TRUE, 0 );
+ vbox.pack_start( frame, FALSE, TRUE, 0 );
auto table = ui::Table( 2, 3, TRUE );
table.show();
// ---- frame ----
dlgTexReset.cbTexChange = ui::CheckButton( "Enabled" );
- g_signal_connect( GTK_OBJECT( dlgTexReset.cbTexChange ), "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL );
+ dlgTexReset.cbTexChange.connect( "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 ),
frame = ui::Frame( "Reset Scales" );
gtk_widget_show( frame );
- gtk_box_pack_start( GTK_BOX( vbox ), frame, FALSE, TRUE, 0 );
+ vbox.pack_start( frame, FALSE, TRUE, 0 );
table = ui::Table( 2, 3, TRUE );
table.show();
// ---- frame ----
dlgTexReset.cbScaleHor = ui::CheckButton( "Enabled" );
- g_signal_connect( GTK_OBJECT( dlgTexReset.cbScaleHor ), "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL );
+ dlgTexReset.cbScaleHor.connect( "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 ),
dlgTexReset.cbScaleVert = ui::CheckButton( "Enabled" );
- g_signal_connect( GTK_OBJECT( dlgTexReset.cbScaleVert ), "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL );
+ dlgTexReset.cbScaleVert.connect( "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 ),
frame = ui::Frame( "Reset Shift" );
gtk_widget_show( frame );
- gtk_box_pack_start( GTK_BOX( vbox ), frame, FALSE, TRUE, 0 );
+ vbox.pack_start( frame, FALSE, TRUE, 0 );
table = ui::Table( 2, 3, TRUE );
table.show();
// ---- frame ----
dlgTexReset.cbShiftHor = ui::CheckButton( "Enabled" );
- g_signal_connect( GTK_OBJECT( dlgTexReset.cbShiftHor ), "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL );
+ dlgTexReset.cbShiftHor.connect( "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 ),
dlgTexReset.cbShiftVert = ui::CheckButton( "Enabled" );
- g_signal_connect( GTK_OBJECT( dlgTexReset.cbShiftVert ), "toggled", G_CALLBACK( dialog_button_callback_texreset_update ), NULL );
+ dlgTexReset.cbShiftVert.connect( "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 ),
frame = ui::Frame( "Reset Rotation" );
gtk_widget_show( frame );
- gtk_box_pack_start( GTK_BOX( vbox ), frame, FALSE, TRUE, 0 );
+ vbox.pack_start( frame, FALSE, TRUE, 0 );
table = ui::Table( 1, 3, TRUE );
table.show();
// ---- /frame ----
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 2 );
+ vbox.pack_start( hbox, FALSE, FALSE, 2 );
gtk_widget_show( hbox );
// ---- hbox ----
w = ui::Button( "Use Selected Brushes" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "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 = ui::Button( "Use All Brushes" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) );
gtk_widget_show( w );
w = ui::Button( "Cancel" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
}
gtk_grab_remove( window );
- gtk_widget_destroy( window );
+ window.destroy();
return ret;
}
EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){
Str texSelected;
- GtkWidget *w, *hbox;
+ ui::Widget w{ui::null};
- GtkWidget *radiusX, *radiusY;
- GtkWidget *angleStart, *angleEnd;
- GtkWidget *heightStart, *heightEnd;
- GtkWidget *numPoints;
+ ui::Widget radiusX{ui::null}, radiusY{ui::null};
+ ui::Widget angleStart{ui::null}, angleEnd{ui::null};
+ ui::Widget heightStart{ui::null}, heightEnd{ui::null};
+ ui::Widget numPoints{ui::null};
EMessageBoxReturn ret;
int loop = 1;
auto window = ui::Window( ui::window_type::TOP );
- g_signal_connect( GTK_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
+ window.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
+ window.connect( "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Train Thing" );
gtk_container_set_border_width( GTK_CONTAINER( window ), 10 );
// ---- vbox ----
- hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 2 );
+ auto hbox = ui::HBox( FALSE, 10 );
+ vbox.pack_start( hbox, FALSE, FALSE, 2 );
gtk_widget_show( hbox );
// ---- /hbox ----
auto frame = ui::Frame( "Radii" );
gtk_widget_show( frame );
- gtk_box_pack_start( GTK_BOX( vbox ), frame, FALSE, TRUE, 0 );
+ vbox.pack_start( frame, FALSE, TRUE, 0 );
auto table = ui::Table( 2, 3, TRUE );
table.show();
frame = ui::Frame( "Angles" );
gtk_widget_show( frame );
- gtk_box_pack_start( GTK_BOX( vbox ), frame, FALSE, TRUE, 0 );
+ vbox.pack_start( frame, FALSE, TRUE, 0 );
table = ui::Table( 2, 3, TRUE );
table.show();
frame = ui::Frame( "Height" );
gtk_widget_show( frame );
- gtk_box_pack_start( GTK_BOX( vbox ), frame, FALSE, TRUE, 0 );
+ vbox.pack_start( frame, FALSE, TRUE, 0 );
table = ui::Table( 2, 3, TRUE );
table.show();
frame = ui::Frame( "Points" );
gtk_widget_show( frame );
- gtk_box_pack_start( GTK_BOX( vbox ), frame, FALSE, TRUE, 0 );
+ vbox.pack_start( frame, FALSE, TRUE, 0 );
table = ui::Table( 2, 3, TRUE );
table.show();
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 2 );
+ vbox.pack_start( hbox, FALSE, FALSE, 2 );
gtk_widget_show( hbox );
// ---- hbox ----
w = ui::Button( "Ok" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "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 = ui::Button( "Cancel" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
}
gtk_grab_remove( window );
- gtk_widget_destroy( window );
+ window.destroy();
return ret;
}
// ailmanki
// add a simple input for the MakeChain thing..
EMessageBoxReturn DoMakeChainBox( MakeChainRS* rs ){
- GtkWidget *w;
- GtkWidget *textlinkNum, *textlinkName;
+ ui::Widget w{ui::null};
+ ui::Entry textlinkNum{ui::null}, textlinkName{ui::null};
EMessageBoxReturn ret;
int loop = 1;
- char const *text = "Please set a value in the boxes below and press 'OK' to make a chain";
+ const char *text = "Please set a value in the boxes below and press 'OK' to make a chain";
auto window = ui::Window( ui::window_type::TOP );
- g_signal_connect( GTK_OBJECT( window ), "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( window ), "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
+ window.connect( "delete_event", G_CALLBACK( dialog_delete_callback ), NULL );
+ window.connect( "destroy", G_CALLBACK( gtk_widget_destroy ), NULL );
gtk_window_set_title( GTK_WINDOW( window ), "Make Chain" );
// dunno if you want this text or not ...
w = ui::Label( text );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
+ hbox.pack_start( w, FALSE, FALSE, 0 );
gtk_widget_show( w );
- w = gtk_hseparator_new();
- gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
+ w = ui::Widget(gtk_hseparator_new());
+ vbox.pack_start( w, FALSE, FALSE, 0 );
gtk_widget_show( w );
// ------------------------- //
// new hbox
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
textlinkNum = ui::Entry( 256 );
- gtk_box_pack_start( GTK_BOX( hbox ), textlinkNum, FALSE, FALSE, 1 );
+ hbox.pack_start( textlinkNum, FALSE, FALSE, 1 );
gtk_widget_show( textlinkNum );
w = ui::Label( "Number of elements in chain" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 1 );
+ hbox.pack_start( w, FALSE, FALSE, 1 );
gtk_widget_show( w );
// -------------------------- //
hbox = ui::HBox( FALSE, 10 );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
+ vbox.pack_start( hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox );
textlinkName = ui::Entry( 256 );
- gtk_box_pack_start( GTK_BOX( hbox ), textlinkName, FALSE, FALSE, 0 );
+ hbox.pack_start( textlinkName, FALSE, FALSE, 0 );
gtk_widget_show( textlinkName );
w = ui::Label( "Basename for chain's targetnames." );
- gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 1 );
+ hbox.pack_start( w, FALSE, FALSE, 1 );
gtk_widget_show( w );
w = ui::Button( "OK" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "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 = ui::Button( "Cancel" );
- gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( w ), "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
+ hbox.pack_start( w, TRUE, TRUE, 0 );
+ w.connect( "clicked", G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( eIDCANCEL ) );
gtk_widget_show( w );
ret = eIDCANCEL;
dialogError = FALSE;
if ( ret == eIDOK ) {
- strcpy( rs->linkName, gtk_entry_get_text( (GtkEntry*)textlinkName ) );
- if ( !ValidateTextInt( gtk_entry_get_text( (GtkEntry*)textlinkNum ), "Elements", &rs->linkNum ) ) {
+ strcpy( rs->linkName, gtk_entry_get_text( textlinkName ) );
+ if ( !ValidateTextInt( gtk_entry_get_text( textlinkNum ), "Elements", &rs->linkNum ) ) {
dialogError = TRUE;
}
}
}
gtk_grab_remove( window );
- gtk_widget_destroy( window );
+ window.destroy();
return ret;
}
projects / xonotic / netradiant.git / blobdiff