minecraft-pi-reborn/zenity
Archived
1
0
Fork 0
Code Pull Requests Activity

Do not make zenity_util_show_dialog() X11 specific

Browse Source
This commit is contained in:
Javier Jardón 2015-04-22 19:59:56 +01:00 committed by Arx Cruz
parent dc97197298
commit d59ce70285
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/option.c
View File

@ -47,7 +47,7 @@ static gchar *zenity_general_ok_button;
static gchar *zenity_general_cancel_button; static gchar *zenity_general_cancel_button;
static gchar **zenity_general_extra_buttons; static gchar **zenity_general_extra_buttons;
static gboolean zenity_general_modal; static gboolean zenity_general_modal;
static gint zenity_general_attach; static guintptr zenity_general_attach;
static gboolean zenity_general_dialog_ellipsize; static gboolean zenity_general_dialog_ellipsize;
/* Calendar Dialog Options */ /* Calendar Dialog Options */

6
src/util.c
View File

@ -39,6 +39,10 @@
#include "util.h" #include "util.h"
#include "zenity.h" #include "zenity.h"
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
#define ZENITY_OK_DEFAULT 0 #define ZENITY_OK_DEFAULT 0
#define ZENITY_CANCEL_DEFAULT 1 #define ZENITY_CANCEL_DEFAULT 1
#define ZENITY_ESC_DEFAULT 1 #define ZENITY_ESC_DEFAULT 1
@ -402,7 +406,7 @@ zenity_util_make_transient (GdkWindow *window, Window parent)
#endif /* GDK_WINDOWING_X11 */ #endif /* GDK_WINDOWING_X11 */
void void
zenity_util_show_dialog (GtkWidget *dialog, Window parent) zenity_util_show_dialog (GtkWidget *dialog, guintptr parent)
{ {
gtk_widget_realize (dialog); gtk_widget_realize (dialog);
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11

7
src/util.h
View File

@ -4,11 +4,6 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "zenity.h" #include "zenity.h"
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#else
typedef gint Window;
#endif
G_BEGIN_DECLS G_BEGIN_DECLS
@ -34,7 +29,7 @@ void zenity_util_show_help (GError **error);
gint zenity_util_return_exit_code (ZenityExitCode value); gint zenity_util_return_exit_code (ZenityExitCode value);
void zenity_util_exit_code_with_data (ZenityExitCode value, void zenity_util_exit_code_with_data (ZenityExitCode value,
ZenityData *data); 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); gboolean zenity_util_timeout_handle (gpointer data);

2
src/zenity.h
View File

@ -34,7 +34,7 @@ typedef struct {
gint exit_code; gint exit_code;
gint timeout_delay; gint timeout_delay;
gboolean modal; gboolean modal;
gint attach; guintptr attach;
} ZenityData; } ZenityData;
typedef enum { typedef enum {