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

gtk_widget_set_usize -> gtk_widget_set_size_request

Browse Source 
-2 in gtk_widget_set_usize() means 'don't change given dimension'
-2 in gtk_widget_set_size_request() = early quit function w/o an effect, thus change to -1
This commit is contained in:
Garux 2020-05-21 16:01:11 +03:00
parent 62603d25fb
commit ab7eb468ec
12 changed files with 120 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/camera/dialogs.cpp
View File

@ -1243,7 +1243,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
gtk_widget_show( hbox );
w = gtk_scrolled_window_new( NULL, NULL );
gtk_widget_set_usize( w, 0, 150 );
gtk_widget_set_size_request( w, 0, 150 );
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( w ), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 );
gtk_widget_show( w );

64
contrib/gtkgensurf/gendlgs.cpp
View File

@ -1488,7 +1488,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table2 ), entry, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "wavelength", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &WaveLength );
@ -1497,7 +1497,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table2 ), entry, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "amplitude", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Amplitude );
@ -1506,7 +1506,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table2 ), entry, 1, 2, 2, 3,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "roughness", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Roughness );
@ -1517,7 +1517,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table2 ), spin, 1, 2, 3, 4,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( spin, 60, -2 );
gtk_widget_set_size_request( spin, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "random", spin );
vbox = gtk_vbox_new( FALSE, 5 );
@ -1588,7 +1588,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "hmin", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Hll );
@ -1597,7 +1597,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 3, 4, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "hmax", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Hur );
@ -1606,7 +1606,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 2, 3,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "vmin", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Vll );
@ -1615,7 +1615,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 3, 4, 2, 3,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "vmax", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Vur );
@ -1651,7 +1651,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( spin, 60, -2 );
gtk_widget_set_size_request( spin, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "nh", spin );
adj = gtk_adjustment_new( 8, 1, MAX_ROWS, 1, 10, 0 );
@ -1661,7 +1661,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( spin, 60, -2 );
gtk_widget_set_size_request( spin, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "nv", spin );
check = gtk_check_button_new_with_label( "Use Bezier patches" );
@ -1681,7 +1681,7 @@ GtkWidget* create_main_dialog(){
spin = gtk_spin_button_new( GTK_ADJUSTMENT( adj ), 1, 0 );
gtk_widget_show( spin );
gtk_box_pack_start( GTK_BOX( vbox ), spin, FALSE, TRUE, 0 );
gtk_widget_set_usize( spin, 60, -2 );
gtk_widget_set_size_request( spin, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "sp", spin );
// ^Fishman - End of Snap to grid code.
@ -1743,7 +1743,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "z01", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Z01 );
@ -1752,7 +1752,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "z00", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Z00 );
@ -1761,7 +1761,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 3, 4, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "z11", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Z11 );
@ -1770,7 +1770,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 3, 4, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "z10", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &Z10 );
@ -1826,14 +1826,14 @@ GtkWidget* create_main_dialog(){
button = gtk_button_new_with_label( "Browse..." );
gtk_widget_show( button );
gtk_box_pack_start( GTK_BOX( hbox2 ), button, FALSE, FALSE, 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "bmp_file_browse", button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( bitmap_browse ), NULL );
button = gtk_button_new_with_label( "Reload" );
gtk_widget_show( button );
gtk_box_pack_start( GTK_BOX( hbox2 ), button, FALSE, FALSE, 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "bmp_reload", button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( bitmap_reload ), NULL );
@ -1871,7 +1871,7 @@ GtkWidget* create_main_dialog(){
entry = gtk_entry_new();
gtk_widget_show( entry );
gtk_box_pack_start( GTK_BOX( hbox2 ), entry, FALSE, FALSE, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "bmp_black", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &gbmp.black_value );
@ -1884,7 +1884,7 @@ GtkWidget* create_main_dialog(){
entry = gtk_entry_new();
gtk_widget_show( entry );
gtk_box_pack_start( GTK_BOX( hbox2 ), entry, FALSE, FALSE, 0 );
gtk_widget_set_usize( entry, 50, -2 );
gtk_widget_set_size_request( entry, 50, -1 );
g_object_set_data( G_OBJECT( dlg ), "bmp_white", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( doublevariable_entryfocusout ), &gbmp.white_value );
@ -1943,7 +1943,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), spin, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND ),
(GtkAttachOptions) ( GTK_EXPAND ), 0, 0 );
gtk_widget_set_usize( spin, 60, -2 );
gtk_widget_set_size_request( spin, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "fix_value", spin );
g_signal_connect( G_OBJECT( spin ), "focus_out_event", G_CALLBACK( fix_value_entryfocusout ), NULL );
@ -1952,7 +1952,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 );
gtk_widget_set_size_request( entry, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "fix_range", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( fix_range_entryfocusout ), NULL );
@ -1961,7 +1961,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 2, 3,
(GtkAttachOptions) ( GTK_EXPAND ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 );
gtk_widget_set_size_request( entry, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "fix_rate", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( fix_rate_entryfocusout ), NULL );
@ -1970,7 +1970,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), button, 2, 3, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "fix_free", button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( fix_free ), NULL );
@ -1979,7 +1979,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), button, 2, 3, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "fix_freeall", button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( fix_freeall ), NULL );
@ -2024,7 +2024,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 );
gtk_widget_set_size_request( entry, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "texture1", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( texture_entryfocusout ), GINT_TO_POINTER( 0 ) );
@ -2033,7 +2033,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 );
gtk_widget_set_size_request( entry, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "texture2", entry );
g_signal_connect( G_OBJECT( entry ), "focus_out_event", G_CALLBACK( texture_entryfocusout ), GINT_TO_POINTER( 1 ) );
@ -2042,7 +2042,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 2, 3,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 );
gtk_widget_set_size_request( entry, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "texture3", entry );
hbox2 = gtk_hbox_new( FALSE, 5 );
@ -2082,7 +2082,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 );
gtk_widget_set_size_request( entry, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "texoffsetx", entry );
entry = gtk_entry_new();
@ -2090,7 +2090,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 );
gtk_widget_set_size_request( entry, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "texoffsety", entry );
entry = gtk_entry_new();
@ -2098,7 +2098,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 2, 3, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 );
gtk_widget_set_size_request( entry, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "texscalex", entry );
entry = gtk_entry_new();
@ -2106,7 +2106,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), entry, 3, 4, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_set_usize( entry, 60, -2 );
gtk_widget_set_size_request( entry, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "texscaley", entry );
@ -2137,7 +2137,7 @@ GtkWidget* create_main_dialog(){
button = gtk_button_new_with_label( "OK" );
gtk_widget_show( button );
gtk_box_pack_start( GTK_BOX( vbox ), button, FALSE, TRUE, 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
g_object_set_data( G_OBJECT( dlg ), "go", button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( main_go ), NULL );

38
contrib/meshtex/GeneralFunctionDialog.cpp
View File

@ -165,7 +165,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -180,7 +180,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -195,7 +195,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -210,7 +210,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -225,7 +225,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -240,7 +240,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -265,7 +265,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -280,7 +280,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -295,7 +295,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -310,7 +310,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -325,7 +325,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -340,7 +340,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -380,7 +380,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 25, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(button, entry);
@ -427,7 +427,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 25, -1);
gtk_widget_set_sensitive(entry, FALSE);
gtk_widget_show(entry);
@ -488,7 +488,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 25, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(button, entry);
@ -535,7 +535,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 25, -1);
gtk_widget_set_sensitive(entry, FALSE);
gtk_widget_show(entry);
@ -573,7 +573,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
button = gtk_button_new_with_label(DIALOG_CANCEL_BUTTON);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize(button, 60, -2);
gtk_widget_set_size_request(button, 60, -1);
gtk_widget_show(button);
CreateCancelButtonCallback(button);
@ -582,7 +582,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
button = gtk_button_new_with_label(DIALOG_APPLY_BUTTON);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 10);
gtk_widget_set_usize (button, 60, -2);
gtk_widget_set_size_request (button, 60, -1);
gtk_widget_show(button);
CreateApplyButtonCallback(button);
@ -591,7 +591,7 @@ GeneralFunctionDialog::GeneralFunctionDialog(const std::string& key) :
button = gtk_button_new_with_label(DIALOG_OK_BUTTON);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize (button, 60, -2);
gtk_widget_set_size_request (button, 60, -1);
gtk_widget_show(button);
CreateOkButtonCallback(button);

10
contrib/meshtex/GetInfoDialog.cpp
View File

@ -127,7 +127,7 @@ GetInfoDialog::GetInfoDialog(const std::string& key,
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(button, label);
@ -150,7 +150,7 @@ GetInfoDialog::GetInfoDialog(const std::string& key,
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(button, label);
@ -171,7 +171,7 @@ GetInfoDialog::GetInfoDialog(const std::string& key,
button = gtk_button_new_with_label(DIALOG_CANCEL_BUTTON);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize(button, 60, -2);
gtk_widget_set_size_request(button, 60, -1);
gtk_widget_show(button);
CreateCancelButtonCallback(button);
@ -180,7 +180,7 @@ GetInfoDialog::GetInfoDialog(const std::string& key,
button = gtk_button_new_with_label(DIALOG_APPLY_BUTTON);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 10);
gtk_widget_set_usize (button, 60, -2);
gtk_widget_set_size_request (button, 60, -1);
gtk_widget_show(button);
CreateApplyButtonCallback(button);
@ -189,7 +189,7 @@ GetInfoDialog::GetInfoDialog(const std::string& key,
button = gtk_button_new_with_label(DIALOG_OK_BUTTON);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize (button, 60, -2);
gtk_widget_set_size_request (button, 60, -1);
gtk_widget_show(button);
CreateOkButtonCallback(button);

22
contrib/meshtex/SetScaleDialog.cpp
View File

@ -164,7 +164,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_set_sensitive(entry, FALSE);
gtk_widget_show(entry);
@ -189,7 +189,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_set_sensitive(entry, TRUE);
gtk_widget_show(entry);
@ -231,7 +231,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 25, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -284,7 +284,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 25, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -367,7 +367,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_set_sensitive(entry, FALSE);
gtk_widget_show(entry);
@ -392,7 +392,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 50, -1);
gtk_widget_set_sensitive(entry, TRUE);
gtk_widget_show(entry);
@ -434,7 +434,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 25, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -487,7 +487,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
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);
gtk_widget_set_size_request(entry, 25, -1);
gtk_widget_show(entry);
UIInstance().RegisterWidgetDependence(applybutton, entry);
@ -525,7 +525,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
button = gtk_button_new_with_label(DIALOG_CANCEL_BUTTON);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize(button, 60, -2);
gtk_widget_set_size_request(button, 60, -1);
gtk_widget_show(button);
CreateCancelButtonCallback(button);
@ -534,7 +534,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
button = gtk_button_new_with_label(DIALOG_APPLY_BUTTON);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 10);
gtk_widget_set_usize (button, 60, -2);
gtk_widget_set_size_request (button, 60, -1);
gtk_widget_show(button);
CreateApplyButtonCallback(button);
@ -543,7 +543,7 @@ SetScaleDialog::SetScaleDialog(const std::string& key) :
button = gtk_button_new_with_label(DIALOG_OK_BUTTON);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_set_usize (button, 60, -2);
gtk_widget_set_size_request (button, 60, -1);
gtk_widget_show(button);
CreateOkButtonCallback(button);

2
contrib/prtview/AboutDialog.cpp
View File

@ -87,7 +87,7 @@ void DoAboutDlg(){
gtk_box_pack_start( GTK_BOX( vbox ), button, FALSE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
gtk_grab_add( dlg );
gtk_widget_show( dlg );

4
contrib/prtview/ConfigDialog.cpp
View File

@ -430,7 +430,7 @@ void DoConfigDialog(){
gtk_widget_show( button );
gtk_box_pack_start( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( OnColor2d ), NULL );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
aa2check = gtk_check_button_new_with_label( "Anti-Alias (May not work on some video cards)" );
gtk_widget_show( aa2check );
@ -455,7 +455,7 @@ void DoConfigDialog(){
gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
// initialize dialog
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( show2check ), portals.show_2d );

6
contrib/prtview/LoadPortalFileDialog.cpp
View File

@ -153,7 +153,7 @@ int DoLoadPortalFileDialog(){
gtk_widget_show( button );
gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( change_clicked ), entry );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
hbox = gtk_hbox_new( FALSE, 5 );
gtk_widget_show( hbox );
@ -164,14 +164,14 @@ int DoLoadPortalFileDialog(){
gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
button = gtk_button_new_with_label( "OK" );
gtk_widget_show( button );
gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
strcpy( portals.fn, GlobalRadiant().getMapName() );
char* fn = strrchr( portals.fn, '.' );

4
radiant/findtexturedialog.cpp
View File

@ -203,14 +203,14 @@ GtkWindow* FindTextureDialog::BuildDialog(){
gtk_box_pack_start( GTK_BOX( vbox ), button, FALSE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( OnApply ), 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
button = gtk_button_new_with_label( "Close" );
gtk_widget_show( button );
gtk_box_pack_start( GTK_BOX( vbox ), button, FALSE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( OnClose ), 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
return dlg;
}

4
radiant/gtkdlgs.cpp
View File

@ -772,14 +772,14 @@ class TextEditor
gtk_box_pack_end( GTK_BOX( hbox ), m_button, FALSE, FALSE, 0 );
g_signal_connect( G_OBJECT( m_button ), "clicked",
G_CALLBACK( editor_close ), this );
gtk_widget_set_usize( m_button, 60, -2 );
gtk_widget_set_size_request( m_button, 60, -1 );
m_button = gtk_button_new_with_label( "Save" );
gtk_widget_show( m_button );
gtk_box_pack_end( GTK_BOX( hbox ), m_button, FALSE, FALSE, 0 );
g_signal_connect( G_OBJECT( m_button ), "clicked",
G_CALLBACK( editor_save ), this );
gtk_widget_set_usize( m_button, 60, -2 );
gtk_widget_set_size_request( m_button, 60, -1 );
}
static void editor_close( GtkWidget *widget, TextEditor* self ){
gtk_widget_hide( self->m_window );

36
radiant/patchdialog.cpp
View File

@ -612,7 +612,7 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_table_attach( table, GTK_WIDGET( combo ), 0, 1, 1, 2,
(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( combo ), 60, -1 );
gtk_widget_set_size_request( GTK_WIDGET( combo ), 60, -1 );
m_pRowCombo = combo;
}
@ -625,7 +625,7 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_table_attach( table, GTK_WIDGET( combo ), 1, 2, 1, 2,
(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( combo ), 60, -1 );
gtk_widget_set_size_request( GTK_WIDGET( combo ), 60, -1 );
m_pColCombo = combo;
}
}
@ -851,7 +851,7 @@ GtkWindow* PatchInspector::BuildDialog(){
(GtkAttachOptions)( GTK_FILL ),
(GtkAttachOptions)( 0 ), 0, 0 );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( OnBtnPatchFlipX ), 0 );
gtk_widget_set_usize( GTK_WIDGET( button ), 60, -1 );
gtk_widget_set_size_request( GTK_WIDGET( button ), 60, -1 );
}
{
GtkLabel* label = GTK_LABEL( gtk_label_new( "Vertical Stretch Step" ) );
@ -868,7 +868,7 @@ GtkWindow* PatchInspector::BuildDialog(){
(GtkAttachOptions)( GTK_FILL ),
(GtkAttachOptions)( 0 ), 0, 0 );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( OnBtnPatchFlipY ), 0 );
gtk_widget_set_usize( GTK_WIDGET( button ), 60, -1 );
gtk_widget_set_size_request( GTK_WIDGET( button ), 60, -1 );
}
{
GtkLabel* label = GTK_LABEL( gtk_label_new( "Rotate Step" ) );
@ -884,7 +884,7 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_table_attach( table, GTK_WIDGET( entry ), 0, 1, 0, 1,
(GtkAttachOptions)( GTK_FILL ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
gtk_widget_set_size_request( GTK_WIDGET( entry ), 50, -1 );
g_object_set_data( G_OBJECT( window ), "hshift_entry", entry );
// we fill in this data, if no patch is selected the widgets are unmodified when the inspector is raised
// so we need to have at least one initialisation somewhere
@ -899,7 +899,7 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 0, 1,
(GtkAttachOptions)( 0 ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( spin ), 16, -2 );
gtk_widget_set_size_request( GTK_WIDGET( spin ), 16, -1 );
gtk_widget_set_can_focus( GTK_WIDGET( spin ), FALSE );
}
{
@ -908,7 +908,7 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_table_attach( table, GTK_WIDGET( entry ), 0, 1, 1, 2,
(GtkAttachOptions)( GTK_FILL ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
gtk_widget_set_size_request( GTK_WIDGET( entry ), 50, -1 );
entry_set_float( entry, g_pi_globals.shift[1] );
GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -8192, 8192, 1, 1, 0 ) );
@ -920,7 +920,7 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 1, 2,
(GtkAttachOptions)( 0 ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( spin ), 16, -2 );
gtk_widget_set_size_request( GTK_WIDGET( spin ), 16, -1 );
gtk_widget_set_can_focus( GTK_WIDGET( spin ), FALSE );
}
{
@ -929,7 +929,7 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_table_attach( table, GTK_WIDGET( entry ), 0, 1, 2, 3,
(GtkAttachOptions)( GTK_FILL ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
gtk_widget_set_size_request( GTK_WIDGET( entry ), 50, -1 );
entry_set_float( entry, g_pi_globals.scale[0] );
GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -1000, 1000, 1, 1, 0 ) );
@ -941,7 +941,7 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 2, 3,
(GtkAttachOptions)( 0 ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( spin ), 16, -2 );
gtk_widget_set_size_request( GTK_WIDGET( spin ), 16, -1 );
gtk_widget_set_can_focus( GTK_WIDGET( spin ), FALSE );
}
{
@ -950,7 +950,7 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_table_attach( table, GTK_WIDGET( entry ), 0, 1, 3, 4,
(GtkAttachOptions)( GTK_FILL ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
gtk_widget_set_size_request( GTK_WIDGET( entry ), 50, -1 );
entry_set_float( entry, g_pi_globals.scale[1] );
GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -1000, 1000, 1, 1, 0 ) );
@ -962,7 +962,7 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 3, 4,
(GtkAttachOptions)( 0 ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( spin ), 16, -2 );
gtk_widget_set_size_request( GTK_WIDGET( spin ), 16, -1 );
gtk_widget_set_can_focus( GTK_WIDGET( spin ), FALSE );
}
{
@ -971,7 +971,7 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_table_attach( table, GTK_WIDGET( entry ), 0, 1, 4, 5,
(GtkAttachOptions)( GTK_FILL ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
gtk_widget_set_size_request( GTK_WIDGET( entry ), 50, -1 );
entry_set_float( entry, g_pi_globals.rotate );
GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -1000, 1000, 1, 1, 0 ) ); // NOTE: Arnout - this really should be 360 but can't change it anymore as it could break existing maps
@ -983,7 +983,7 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 4, 5,
(GtkAttachOptions)( 0 ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( spin ), 16, -2 );
gtk_widget_set_size_request( GTK_WIDGET( spin ), 16, -1 );
gtk_widget_set_can_focus( GTK_WIDGET( spin ), FALSE );
}
}
@ -995,28 +995,28 @@ GtkWindow* PatchInspector::BuildDialog(){
gtk_widget_show( GTK_WIDGET( button ) );
gtk_box_pack_end( GTK_BOX( hbox2 ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( OnBtnPatchCap ), 0 );
gtk_widget_set_usize( GTK_WIDGET( button ), 60, -1 );
gtk_widget_set_size_request( GTK_WIDGET( button ), 60, -1 );
}
{
GtkButton* button = GTK_BUTTON( gtk_button_new_with_label( "Set..." ) );
gtk_widget_show( GTK_WIDGET( button ) );
gtk_box_pack_end( GTK_BOX( hbox2 ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( OnBtnPatchFit ), 0 );
gtk_widget_set_usize( GTK_WIDGET( button ), 60, -1 );
gtk_widget_set_size_request( GTK_WIDGET( button ), 60, -1 );
}
{
GtkButton* button = GTK_BUTTON( gtk_button_new_with_label( "Natural" ) );
gtk_widget_show( GTK_WIDGET( button ) );
gtk_box_pack_end( GTK_BOX( hbox2 ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( OnBtnPatchNatural ), 0 );
gtk_widget_set_usize( GTK_WIDGET( button ), 60, -1 );
gtk_widget_set_size_request( GTK_WIDGET( button ), 60, -1 );
}
{
GtkButton* button = GTK_BUTTON( gtk_button_new_with_label( "Fit" ) );
gtk_widget_show( GTK_WIDGET( button ) );
gtk_box_pack_end( GTK_BOX( hbox2 ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( OnBtnPatchFit11 ), 0 );
gtk_widget_set_usize( GTK_WIDGET( button ), 60, -1 );
gtk_widget_set_size_request( GTK_WIDGET( button ), 60, -1 );
}
}
}

48
radiant/surfacedialog.cpp
View File

@ -768,7 +768,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), GTK_WIDGET( spin ), 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( spin ), 60, -2 );
gtk_widget_set_size_request( GTK_WIDGET( spin ), 60, -1 );
}
{
GtkWidget* label = gtk_label_new( "Step" );
@ -784,7 +784,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), GTK_WIDGET( entry ), 3, 4, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
gtk_widget_set_size_request( GTK_WIDGET( entry ), 50, -1 );
m_hshiftIncrement.m_entry = entry;
m_hshiftEntry.connect( entry );
}
@ -804,7 +804,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), GTK_WIDGET( spin ), 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( spin ), 60, -2 );
gtk_widget_set_size_request( GTK_WIDGET( spin ), 60, -1 );
}
{
GtkWidget* label = gtk_label_new( "Step" );
@ -820,7 +820,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), GTK_WIDGET( entry ), 3, 4, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
gtk_widget_set_size_request( GTK_WIDGET( entry ), 50, -1 );
m_vshiftIncrement.m_entry = entry;
m_vshiftEntry.connect( entry );
}
@ -840,7 +840,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), GTK_WIDGET( spin ), 1, 2, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( spin ), 60, -2 );
gtk_widget_set_size_request( GTK_WIDGET( spin ), 60, -1 );
}
{
GtkWidget* label = gtk_label_new( "Step" );
@ -856,7 +856,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), GTK_WIDGET( entry ), 3, 4, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 2, 3 );
gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
gtk_widget_set_size_request( GTK_WIDGET( entry ), 50, -1 );
m_hscaleIncrement.m_entry = entry;
m_hscaleEntry.connect( entry );
}
@ -876,7 +876,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), GTK_WIDGET( spin ), 1, 2, 3, 4,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( spin ), 60, -2 );
gtk_widget_set_size_request( GTK_WIDGET( spin ), 60, -1 );
}
{
GtkWidget* label = gtk_label_new( "Step" );
@ -892,7 +892,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), GTK_WIDGET( entry ), 3, 4, 3, 4,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
gtk_widget_set_size_request( GTK_WIDGET( entry ), 50, -1 );
m_vscaleIncrement.m_entry = entry;
m_vscaleEntry.connect( entry );
}
@ -912,7 +912,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), GTK_WIDGET( spin ), 1, 2, 4, 5,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( spin ), 60, -2 );
gtk_widget_set_size_request( GTK_WIDGET( spin ), 60, -1 );
gtk_spin_button_set_wrap( spin, TRUE );
}
{
@ -929,7 +929,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), GTK_WIDGET( entry ), 3, 4, 4, 5,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
gtk_widget_set_size_request( GTK_WIDGET( entry ), 50, -1 );
m_rotateIncrement.m_entry = entry;
m_rotateEntry.connect( entry );
}
@ -979,7 +979,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( OnBtnFaceFitWidth ), 0 );
g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( OnBtnFaceFitWidthOnly ), 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
}
{
GtkWidget* button = gtk_button_new_with_label( "Height" );
@ -991,7 +991,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( OnBtnFaceFitHeight ), 0 );
g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( OnBtnFaceFitHeightOnly ), 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
}
{
GtkWidget* button = gtk_button_new_with_label( "Reset" );
@ -1001,7 +1001,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
(GtkAttachOptions) ( 0 ), 0, 0 );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( OnBtnReset ), 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
}
{
GtkWidget* button = gtk_button_new_with_label( "Fit" );
@ -1011,7 +1011,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
(GtkAttachOptions) ( 0 ), 0, 0 );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( OnBtnFaceFit ), 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
}
{
GtkWidget* label = gtk_label_new( "Project:" );
@ -1031,7 +1031,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
G_CALLBACK( OnBtnProject ), (gpointer)eProjectAxial );
GtkRequisition req;
gtk_widget_size_request( button, &req );
gtk_widget_set_usize( button, 60, req.height * 3 / 4 );
gtk_widget_set_size_request( button, 60, req.height * 3 / 4 );
}
{
GtkWidget* button = gtk_button_new_with_label( "Ortho" );
@ -1044,7 +1044,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
G_CALLBACK( OnBtnProject ), (gpointer)eProjectOrtho );
GtkRequisition req;
gtk_widget_size_request( button, &req );
gtk_widget_set_usize( button, 60, req.height * 3 / 4 );
gtk_widget_set_size_request( button, 60, req.height * 3 / 4 );
}
{
GtkWidget* button = gtk_button_new_with_label( "Cam" );
@ -1057,7 +1057,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
G_CALLBACK( OnBtnProject ), (gpointer)eProjectCam );
GtkRequisition req;
gtk_widget_size_request( button, &req );
gtk_widget_set_usize( button, 60, req.height * 3 / 4 );
gtk_widget_set_size_request( button, 60, req.height * 3 / 4 );
}
{
GtkWidget* button = gtk_button_new_with_label( "CAP" );
@ -1067,7 +1067,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
(GtkAttachOptions) ( 0 ), 0, 0 );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( OnBtnPatchCap ), 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
}
{
GtkWidget* button = gtk_button_new_with_label( "Set..." );
@ -1077,7 +1077,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
(GtkAttachOptions) ( 0 ), 0, 0 );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( OnBtnPatchFit ), 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
}
{
GtkWidget* button = gtk_button_new_with_label( "Natural" );
@ -1087,7 +1087,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
(GtkAttachOptions) ( 0 ), 0, 0 );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( OnBtnPatchNatural ), 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
}
{
GtkWidget* button = gtk_button_new_with_label( "Fit" );
@ -1097,7 +1097,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
(GtkAttachOptions) ( 0 ), 0, 0 );
g_signal_connect( G_OBJECT( button ), "clicked",
G_CALLBACK( OnBtnPatchFit11 ), 0 );
gtk_widget_set_usize( button, 60, -2 );
gtk_widget_set_size_request( button, 60, -1 );
}
{
GtkWidget* spin = gtk_spin_button_new( GTK_ADJUSTMENT( gtk_adjustment_new( 1, 0, 1 << 16, 1, 10, 0 ) ), 0, 3 );
@ -1105,7 +1105,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), spin, 2, 3, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_usize( spin, 60, -2 );
gtk_widget_set_size_request( spin, 60, -1 );
AddDialogData( *GTK_SPIN_BUTTON( spin ), m_fitHorizontal );
}
{
@ -1114,7 +1114,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), spin, 3, 4, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_set_usize( spin, 60, -2 );
gtk_widget_set_size_request( spin, 60, -1 );
AddDialogData( *GTK_SPIN_BUTTON( spin ), m_fitVertical );
}
}
@ -1230,7 +1230,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
gtk_widget_set_can_focus( TexTool::g_textoolWin, TRUE );
// <-- end stuff...
gtk_widget_show( TexTool::g_textoolWin );
gtk_widget_set_usize( TexTool::g_textoolWin, -1, 240 ); //Yeah!
gtk_widget_set_size_request( TexTool::g_textoolWin, -1, 240 ); //Yeah!
gtk_container_add( GTK_CONTAINER( frame ), TexTool::g_textoolWin );
g_signal_connect( G_OBJECT( TexTool::g_textoolWin ), "size_allocate", G_CALLBACK( TexTool::size_allocate ), NULL );