Remove <gtk/gtk.h> from most of radiant/*

[xonotic/netradiant.git] / radiant / select.cpp

diff --git a/radiant/select.cpp b/radiant/select.cpp
index 4246ab428d0eee68eb287baaa080d5dd0e57f37d..5c2560b574ff2cd0bca2d6a84d5c0a70d7c3bef1 100644 (file)
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -830,10 +830,6 @@ void Selection_destroy(){
 
 
 #include "gtkdlgs.h"
-#include <gtk/gtkbox.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
 #include <gdk/gdkkeysyms.h>
 
 
@@ -870,10 +866,10 @@ struct RotateDialog
        GtkSpinButton* x;
        GtkSpinButton* y;
        GtkSpinButton* z;
-       GtkWindow *window;
+       ui::Window window;
 };
 
-static gboolean rotatedlg_apply( GtkWidget *widget, RotateDialog* rotateDialog ){
+static gboolean rotatedlg_apply( ui::Widget widget, RotateDialog* rotateDialog ){
        Vector3 eulerXYZ;
 
        eulerXYZ[0] = static_cast<float>( gtk_spin_button_get_value( rotateDialog->x ) );
@@ -888,7 +884,7 @@ static gboolean rotatedlg_apply( GtkWidget *widget, RotateDialog* rotateDialog )
        return TRUE;
 }
 
-static gboolean rotatedlg_cancel( GtkWidget *widget, RotateDialog* rotateDialog ){
+static gboolean rotatedlg_cancel( ui::Widget widget, RotateDialog* rotateDialog ){
        gtk_widget_hide( GTK_WIDGET( rotateDialog->window ) );
 
        gtk_spin_button_set_value( rotateDialog->x, 0.0f ); // reset to 0 on close
@@ -898,24 +894,24 @@ static gboolean rotatedlg_cancel( GtkWidget *widget, RotateDialog* rotateDialog
        return TRUE;
 }
 
-static gboolean rotatedlg_ok( GtkWidget *widget, RotateDialog* rotateDialog ){
+static gboolean rotatedlg_ok( ui::Widget widget, RotateDialog* rotateDialog ){
        rotatedlg_apply( widget, rotateDialog );
-       rotatedlg_cancel( widget, rotateDialog );
+       gtk_widget_hide( GTK_WIDGET( rotateDialog->window ) );
        return TRUE;
 }
 
-static gboolean rotatedlg_delete( GtkWidget *widget, GdkEventAny *event, RotateDialog* rotateDialog ){
+static gboolean rotatedlg_delete( ui::Widget widget, GdkEventAny *event, RotateDialog* rotateDialog ){
        rotatedlg_cancel( widget, rotateDialog );
        return TRUE;
 }
 
 RotateDialog g_rotate_dialog;
 void DoRotateDlg(){
-       if ( g_rotate_dialog.window == NULL ) {
-               g_rotate_dialog.window = create_dialog_window( MainFrame_getWindow(), "Arbitrary rotation", G_CALLBACK( rotatedlg_delete ), &g_rotate_dialog );
+       if ( !g_rotate_dialog.window ) {
+               g_rotate_dialog.window = MainFrame_getWindow().create_dialog_window("Arbitrary rotation", G_CALLBACK(rotatedlg_delete ), &g_rotate_dialog );
 
-               GtkAccelGroup* accel = gtk_accel_group_new();
-               gtk_window_add_accel_group( g_rotate_dialog.window, accel );
+               auto accel = ui::AccelGroup();
+               g_rotate_dialog.window.add_accel_group( accel );
 
                {
                        GtkHBox* hbox = create_dialog_hbox( 4, 4 );
@@ -924,29 +920,29 @@ void DoRotateDlg(){
                                GtkTable* table = create_dialog_table( 3, 2, 4, 4 );
                                gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( table ), TRUE, TRUE, 0 );
                                {
-                                       GtkWidget* label = gtk_label_new( "  X  " );
+                                       ui::Widget label = ui::Label( "  X  " );
                                        gtk_widget_show( label );
                                        gtk_table_attach( table, label, 0, 1, 0, 1,
                                                                          (GtkAttachOptions) ( 0 ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkWidget* label = gtk_label_new( "  Y  " );
+                                       ui::Widget label = ui::Label( "  Y  " );
                                        gtk_widget_show( label );
                                        gtk_table_attach( table, label, 0, 1, 1, 2,
                                                                          (GtkAttachOptions) ( 0 ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkWidget* label = gtk_label_new( "  Z  " );
+                                       ui::Widget label = ui::Label( "  Z  " );
                                        gtk_widget_show( label );
                                        gtk_table_attach( table, label, 0, 1, 2, 3,
                                                                          (GtkAttachOptions) ( 0 ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -359, 359, 1, 10, 0 ) );
-                                       GtkSpinButton* spin = GTK_SPIN_BUTTON( gtk_spin_button_new( adj, 1, 0 ) );
+                                       auto adj = ui::Adjustment( 0, -359, 359, 1, 10, 0 );
+                                       GtkSpinButton* spin = ui::SpinButton( adj, 1, 0 );
                                        gtk_widget_show( GTK_WIDGET( spin ) );
                                        gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 0, 1,
                                                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
@@ -959,8 +955,8 @@ void DoRotateDlg(){
                                        g_rotate_dialog.x = spin;
                                }
                                {
-                                       GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -359, 359, 1, 10, 0 ) );
-                                       GtkSpinButton* spin = GTK_SPIN_BUTTON( gtk_spin_button_new( adj, 1, 0 ) );
+                                       auto adj = ui::Adjustment( 0, -359, 359, 1, 10, 0 );
+                                       GtkSpinButton* spin = ui::SpinButton( adj, 1, 0 );
                                        gtk_widget_show( GTK_WIDGET( spin ) );
                                        gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 1, 2,
                                                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
@@ -971,8 +967,8 @@ void DoRotateDlg(){
                                        g_rotate_dialog.y = spin;
                                }
                                {
-                                       GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -359, 359, 1, 10, 0 ) );
-                                       GtkSpinButton* spin = GTK_SPIN_BUTTON( gtk_spin_button_new( adj, 1, 0 ) );
+                                       auto adj = ui::Adjustment( 0, -359, 359, 1, 10, 0 );
+                                       GtkSpinButton* spin = ui::SpinButton( adj, 1, 0 );
                                        gtk_widget_show( GTK_WIDGET( spin ) );
                                        gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 2, 3,
                                                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
@@ -987,9 +983,9 @@ void DoRotateDlg(){
                                GtkVBox* vbox = create_dialog_vbox( 4 );
                                gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 );
                                {
-                                       GtkButton* button = create_dialog_button( "OK", G_CALLBACK( rotatedlg_ok ), &g_rotate_dialog );
+                                       auto button = create_dialog_button( "OK", G_CALLBACK( rotatedlg_ok ), &g_rotate_dialog );
                                        gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
-                                       widget_make_default( GTK_WIDGET( button ) );
+                                       widget_make_default( button );
                                        gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
                                }
                                {
@@ -1018,13 +1014,13 @@ void DoRotateDlg(){
 
 struct ScaleDialog
 {
-       GtkWidget* x;
-       GtkWidget* y;
-       GtkWidget* z;
-       GtkWindow *window;
+       ui::Widget x;
+       ui::Widget y;
+       ui::Widget z;
+       ui::Window window;
 };
 
-static gboolean scaledlg_apply( GtkWidget *widget, ScaleDialog* scaleDialog ){
+static gboolean scaledlg_apply( ui::Widget widget, ScaleDialog* scaleDialog ){
        float sx, sy, sz;
 
        sx = static_cast<float>( atof( gtk_entry_get_text( GTK_ENTRY( scaleDialog->x ) ) ) );
@@ -1040,7 +1036,7 @@ static gboolean scaledlg_apply( GtkWidget *widget, ScaleDialog* scaleDialog ){
        return TRUE;
 }
 
-static gboolean scaledlg_cancel( GtkWidget *widget, ScaleDialog* scaleDialog ){
+static gboolean scaledlg_cancel( ui::Widget widget, ScaleDialog* scaleDialog ){
        gtk_widget_hide( GTK_WIDGET( scaleDialog->window ) );
 
        gtk_entry_set_text( GTK_ENTRY( scaleDialog->x ), "1.0" );
@@ -1050,13 +1046,13 @@ static gboolean scaledlg_cancel( GtkWidget *widget, ScaleDialog* scaleDialog ){
        return TRUE;
 }
 
-static gboolean scaledlg_ok( GtkWidget *widget, ScaleDialog* scaleDialog ){
+static gboolean scaledlg_ok( ui::Widget widget, ScaleDialog* scaleDialog ){
        scaledlg_apply( widget, scaleDialog );
-       scaledlg_cancel( widget, scaleDialog );
+       gtk_widget_hide( GTK_WIDGET( scaleDialog->window ) );
        return TRUE;
 }
 
-static gboolean scaledlg_delete( GtkWidget *widget, GdkEventAny *event, ScaleDialog* scaleDialog ){
+static gboolean scaledlg_delete( ui::Widget widget, GdkEventAny *event, ScaleDialog* scaleDialog ){
        scaledlg_cancel( widget, scaleDialog );
        return TRUE;
 }
@@ -1064,11 +1060,11 @@ static gboolean scaledlg_delete( GtkWidget *widget, GdkEventAny *event, ScaleDia
 ScaleDialog g_scale_dialog;
 
 void DoScaleDlg(){
-       if ( g_scale_dialog.window == NULL ) {
-               g_scale_dialog.window = create_dialog_window( MainFrame_getWindow(), "Arbitrary scale", G_CALLBACK( scaledlg_delete ), &g_scale_dialog );
+       if ( !g_scale_dialog.window ) {
+               g_scale_dialog.window = MainFrame_getWindow().create_dialog_window("Arbitrary scale", G_CALLBACK(scaledlg_delete ), &g_scale_dialog );
 
-               GtkAccelGroup* accel = gtk_accel_group_new();
-               gtk_window_add_accel_group( g_scale_dialog.window, accel );
+               auto accel = ui::AccelGroup();
+               g_scale_dialog.window.add_accel_group( accel );
 
                {
                        GtkHBox* hbox = create_dialog_hbox( 4, 4 );
@@ -1077,28 +1073,28 @@ void DoScaleDlg(){
                                GtkTable* table = create_dialog_table( 3, 2, 4, 4 );
                                gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( table ), TRUE, TRUE, 0 );
                                {
-                                       GtkWidget* label = gtk_label_new( "  X  " );
+                                       ui::Widget label = ui::Label( "  X  " );
                                        gtk_widget_show( label );
                                        gtk_table_attach( table, label, 0, 1, 0, 1,
                                                                          (GtkAttachOptions) ( 0 ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkWidget* label = gtk_label_new( "  Y  " );
+                                       ui::Widget label = ui::Label( "  Y  " );
                                        gtk_widget_show( label );
                                        gtk_table_attach( table, label, 0, 1, 1, 2,
                                                                          (GtkAttachOptions) ( 0 ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkWidget* label = gtk_label_new( "  Z  " );
+                                       ui::Widget label = ui::Label( "  Z  " );
                                        gtk_widget_show( label );
                                        gtk_table_attach( table, label, 0, 1, 2, 3,
                                                                          (GtkAttachOptions) ( 0 ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkWidget* entry = gtk_entry_new();
+                                       ui::Widget entry = ui::Entry();
                                        gtk_entry_set_text( GTK_ENTRY( entry ), "1.0" );
                                        gtk_widget_show( entry );
                                        gtk_table_attach( table, entry, 1, 2, 0, 1,
@@ -1108,7 +1104,7 @@ void DoScaleDlg(){
                                        g_scale_dialog.x = entry;
                                }
                                {
-                                       GtkWidget* entry = gtk_entry_new();
+                                       ui::Widget entry = ui::Entry();
                                        gtk_entry_set_text( GTK_ENTRY( entry ), "1.0" );
                                        gtk_widget_show( entry );
                                        gtk_table_attach( table, entry, 1, 2, 1, 2,
@@ -1118,7 +1114,7 @@ void DoScaleDlg(){
                                        g_scale_dialog.y = entry;
                                }
                                {
-                                       GtkWidget* entry = gtk_entry_new();
+                                       ui::Widget entry = ui::Entry();
                                        gtk_entry_set_text( GTK_ENTRY( entry ), "1.0" );
                                        gtk_widget_show( entry );
                                        gtk_table_attach( table, entry, 1, 2, 2, 3,
@@ -1132,9 +1128,9 @@ void DoScaleDlg(){
                                GtkVBox* vbox = create_dialog_vbox( 4 );
                                gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 );
                                {
-                                       GtkButton* button = create_dialog_button( "OK", G_CALLBACK( scaledlg_ok ), &g_scale_dialog );
+                                       auto button = create_dialog_button( "OK", G_CALLBACK( scaledlg_ok ), &g_scale_dialog );
                                        gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
-                                       widget_make_default( GTK_WIDGET( button ) );
+                                       widget_make_default( button );
                                        gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
                                }
                                {