Wrap more GTK

[xonotic/netradiant.git] / libs / gtkutil / filechooser.cpp

diff --git a/libs/gtkutil/filechooser.cpp b/libs/gtkutil/filechooser.cpp
index d65d310ca567dc3eac3d47da95ccb6b946f37b56..c2c74c2f3d660e496b732ec3da435f5fde7d577b 100644 (file)
--- a/libs/gtkutil/filechooser.cpp
+++ b/libs/gtkutil/filechooser.cpp
@@ -25,11 +25,8 @@
 
 #include <list>
 #include <vector>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
+#include <uilib/uilib.h>
 
 #include "string/string.h"
 #include "stream/stringstream.h"
@@ -233,7 +230,7 @@ const char* file_dialog_show( GtkWidget* parent, bool open, const char* title, c
                g_file_dialog_file[0] = '\0';
        }
 
-       gtk_widget_destroy( dialog );
+       ui::Widget(dialog).destroy();
 
        // don't return an empty filename
        if ( g_file_dialog_file[0] == '\0' ) {
@@ -243,7 +240,7 @@ const char* file_dialog_show( GtkWidget* parent, bool open, const char* title, c
        return g_file_dialog_file;
 }
 
-char* dir_dialog( GtkWidget* parent, const char* title, const char* path ){
+char* dir_dialog( ui::Widget parent, const char* title, const char* path ){
        GtkWidget* dialog = gtk_file_chooser_dialog_new( title,
                                                                                                         GTK_WINDOW( parent ),
                                                                                                         GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
@@ -263,12 +260,12 @@ char* dir_dialog( GtkWidget* parent, const char* title, const char* path ){
                filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( dialog ) );
        }
 
-       gtk_widget_destroy( dialog );
+       ui::Widget(dialog).destroy();
 
        return filename;
 }
 
-const char* file_dialog( GtkWidget* parent, bool open, const char* title, const char* path, const char* pattern, bool want_load, bool want_import, bool want_save ){
+const char* file_dialog( ui::Widget parent, bool open, const char* title, const char* path, const char* pattern, bool want_load, bool want_import, bool want_save ){
        for (;; )
        {
                const char* file = file_dialog_show( parent, open, title, path, pattern, want_load, want_import, want_save );
@@ -276,7 +273,7 @@ const char* file_dialog( GtkWidget* parent, bool open, const char* title, const
                if ( open
                         || file == 0
                         || !file_exists( file )
-                        || gtk_MessageBox( parent, "The file specified already exists.\nDo you want to replace it?", title, eMB_NOYES, eMB_ICONQUESTION ) == eIDYES ) {
+                        || parent.alert("The file specified already exists.\nDo you want to replace it?", title, ui::alert_type::NOYES, ui::alert_icon::Question ) == ui::alert_response::YES ) {
                        return file;
                }
        }