diff options
| author | Javier Jardón <jjardon@gnome.org> | 2015-04-22 19:59:56 +0100 |
|---|---|---|
| committer | Arx Cruz <arxcruz@gnome.org> | 2015-04-23 10:08:14 +0200 |
| commit | d59ce70285a0c5d7dd634ba5cc746b331edac4ce (patch) | |
| tree | 62b6719e05106237a2b0d4f9d16244a709fdfb14 /src | |
| parent | dc9719729899574d7f3b2056382af83fd106bd47 (diff) | |
| download | zenity-d59ce70285a0c5d7dd634ba5cc746b331edac4ce.tar.gz | |
Do not make zenity_util_show_dialog() X11 specific
Diffstat (limited to 'src')
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/util.c | 6 | ||||
| -rw-r--r-- | src/util.h | 7 | ||||
| -rw-r--r-- | src/zenity.h | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/option.c b/src/option.c index 431b9b6..3e35144 100644 --- a/src/option.c +++ b/src/option.c @@ -47,7 +47,7 @@ static gchar *zenity_general_ok_button; static gchar *zenity_general_cancel_button; static gchar **zenity_general_extra_buttons; static gboolean zenity_general_modal; -static gint zenity_general_attach; +static guintptr zenity_general_attach; static gboolean zenity_general_dialog_ellipsize; /* Calendar Dialog Options */ @@ -39,6 +39,10 @@ #include "util.h" #include "zenity.h" +#ifdef GDK_WINDOWING_X11 +#include <gdk/gdkx.h> +#endif + #define ZENITY_OK_DEFAULT 0 #define ZENITY_CANCEL_DEFAULT 1 #define ZENITY_ESC_DEFAULT 1 @@ -402,7 +406,7 @@ zenity_util_make_transient (GdkWindow *window, Window parent) #endif /* GDK_WINDOWING_X11 */ void -zenity_util_show_dialog (GtkWidget *dialog, Window parent) +zenity_util_show_dialog (GtkWidget *dialog, guintptr parent) { gtk_widget_realize (dialog); #ifdef GDK_WINDOWING_X11 @@ -4,11 +4,6 @@ #include <gtk/gtk.h> #include "zenity.h" -#ifdef GDK_WINDOWING_X11 -#include <gdk/gdkx.h> -#else -typedef gint Window; -#endif G_BEGIN_DECLS @@ -34,7 +29,7 @@ void zenity_util_show_help (GError **error); gint zenity_util_return_exit_code (ZenityExitCode value); void zenity_util_exit_code_with_data (ZenityExitCode value, ZenityData *data); -void zenity_util_show_dialog (GtkWidget *widget, Window parent); +void zenity_util_show_dialog (GtkWidget *widget, guintptr parent); gboolean zenity_util_timeout_handle (gpointer data); diff --git a/src/zenity.h b/src/zenity.h index 77f0c05..bab11e3 100644 --- a/src/zenity.h +++ b/src/zenity.h @@ -34,7 +34,7 @@ typedef struct { gint exit_code; gint timeout_delay; gboolean modal; - gint attach; + guintptr attach; } ZenityData; typedef enum { |