[gimp] Globally switch to saying "window_id" instead of just "window"
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Globally switch to saying "window_id" instead of just "window"
- Date: Sun, 6 Feb 2011 11:09:55 +0000 (UTC)
commit f4af9b549eb4e8431a2686f45339385ca262bb3f
Author: Michael Natterer <mitch gimp org>
Date: Sun Feb 6 12:07:55 2011 +0100
Globally switch to saying "window_id" instead of just "window"
when dealing with native window handles. Also get rid of using
GdkNativeWindow and simply consistently use guint32 all over the
place. This is more obvious and consistent and keeps the diff to the
gtk3-port branch smaller.
app/core/gimp-gui.c | 54 +++---
app/core/gimp-gui.h | 270 +++++++++++++++---------------
app/core/gimppdbprogress.c | 42 +++---
app/core/gimpprogress.c | 6 +-
app/core/gimpprogress.h | 44 +++---
app/core/gimpsubprogress.c | 63 ++++----
app/display/gimpdisplay.c | 99 ++++++------
app/display/gimpdisplayshell-progress.c | 22 ++--
app/gui/gui-message.c | 6 +-
app/gui/gui-vtable.c | 166 ++++++++++----------
app/pdb/display-cmds.c | 2 +-
app/pdb/progress-cmds.c | 2 +-
app/plug-in/gimpplugin-progress.c | 4 +-
app/plug-in/gimpplugin-progress.h | 38 +++---
app/widgets/gimpfiledialog.c | 22 ++--
app/widgets/gimphelp.c | 12 +-
app/widgets/gimpwidgets-utils.c | 14 +-
app/widgets/gimpwidgets-utils.h | 2 +-
libgimp/gimpprogressbar.c | 6 +-
tools/pdbgen/pdb/display.pdb | 2 +-
tools/pdbgen/pdb/progress.pdb | 2 +-
21 files changed, 439 insertions(+), 439 deletions(-)
---
diff --git a/app/core/gimp-gui.c b/app/core/gimp-gui.c
index 8af61f9..957d78e 100644
--- a/app/core/gimp-gui.c
+++ b/app/core/gimp-gui.c
@@ -40,29 +40,29 @@ gimp_gui_init (Gimp *gimp)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
- gimp->gui.ungrab = NULL;
- gimp->gui.threads_enter = NULL;
- gimp->gui.threads_leave = NULL;
- gimp->gui.set_busy = NULL;
- gimp->gui.unset_busy = NULL;
- gimp->gui.show_message = NULL;
- gimp->gui.help = NULL;
- gimp->gui.get_program_class = NULL;
- gimp->gui.get_display_name = NULL;
- gimp->gui.get_user_time = NULL;
- gimp->gui.get_theme_dir = NULL;
- gimp->gui.display_get_by_id = NULL;
- gimp->gui.display_get_id = NULL;
- gimp->gui.display_get_window = NULL;
- gimp->gui.display_create = NULL;
- gimp->gui.display_delete = NULL;
- gimp->gui.displays_reconnect = NULL;
- gimp->gui.progress_new = NULL;
- gimp->gui.progress_free = NULL;
- gimp->gui.pdb_dialog_set = NULL;
- gimp->gui.pdb_dialog_close = NULL;
- gimp->gui.recent_list_add_uri = NULL;
- gimp->gui.recent_list_load = NULL;
+ gimp->gui.ungrab = NULL;
+ gimp->gui.threads_enter = NULL;
+ gimp->gui.threads_leave = NULL;
+ gimp->gui.set_busy = NULL;
+ gimp->gui.unset_busy = NULL;
+ gimp->gui.show_message = NULL;
+ gimp->gui.help = NULL;
+ gimp->gui.get_program_class = NULL;
+ gimp->gui.get_display_name = NULL;
+ gimp->gui.get_user_time = NULL;
+ gimp->gui.get_theme_dir = NULL;
+ gimp->gui.display_get_by_id = NULL;
+ gimp->gui.display_get_id = NULL;
+ gimp->gui.display_get_window_id = NULL;
+ gimp->gui.display_create = NULL;
+ gimp->gui.display_delete = NULL;
+ gimp->gui.displays_reconnect = NULL;
+ gimp->gui.progress_new = NULL;
+ gimp->gui.progress_free = NULL;
+ gimp->gui.pdb_dialog_set = NULL;
+ gimp->gui.pdb_dialog_close = NULL;
+ gimp->gui.recent_list_add_uri = NULL;
+ gimp->gui.recent_list_load = NULL;
}
void
@@ -297,14 +297,14 @@ gimp_get_display_ID (Gimp *gimp,
}
guint32
-gimp_get_display_window (Gimp *gimp,
- GimpObject *display)
+gimp_get_display_window_id (Gimp *gimp,
+ GimpObject *display)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), -1);
g_return_val_if_fail (GIMP_IS_OBJECT (display), -1);
- if (gimp->gui.display_get_window)
- return gimp->gui.display_get_window (display);
+ if (gimp->gui.display_get_window_id)
+ return gimp->gui.display_get_window_id (display);
return -1;
}
diff --git a/app/core/gimp-gui.h b/app/core/gimp-gui.h
index 99e4e3f..82a02c6 100644
--- a/app/core/gimp-gui.h
+++ b/app/core/gimp-gui.h
@@ -23,145 +23,145 @@ typedef struct _GimpGui GimpGui;
struct _GimpGui
{
- void (* ungrab) (Gimp *gimp);
-
- void (* threads_enter) (Gimp *gimp);
- void (* threads_leave) (Gimp *gimp);
-
- void (* set_busy) (Gimp *gimp);
- void (* unset_busy) (Gimp *gimp);
-
- void (* show_message) (Gimp *gimp,
- GObject *handler,
- GimpMessageSeverity severity,
- const gchar *domain,
- const gchar *message);
- void (* help) (Gimp *gimp,
- GimpProgress *progress,
- const gchar *help_domain,
- const gchar *help_id);
-
- const gchar * (* get_program_class) (Gimp *gimp);
- gchar * (* get_display_name) (Gimp *gimp,
- gint display_ID,
- gint *monitor_number);
- guint32 (* get_user_time) (Gimp *gimp);
-
- const gchar * (* get_theme_dir) (Gimp *gimp);
-
- GimpObject * (* get_empty_display) (Gimp *gimp);
- GimpObject * (* display_get_by_id) (Gimp *gimp,
- gint ID);
- gint (* display_get_id) (GimpObject *display);
- guint32 (* display_get_window) (GimpObject *display);
- GimpObject * (* display_create) (Gimp *gimp,
- GimpImage *image,
- GimpUnit unit,
- gdouble scale);
- void (* display_delete) (GimpObject *display);
- void (* displays_reconnect) (Gimp *gimp,
- GimpImage *old_image,
- GimpImage *new_image);
-
- GimpProgress * (* progress_new) (Gimp *gimp,
- GimpObject *display);
- void (* progress_free) (Gimp *gimp,
- GimpProgress *progress);
-
- gboolean (* pdb_dialog_new) (Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- GimpContainer *container,
- const gchar *title,
- const gchar *callback_name,
- const gchar *object_name,
- va_list args);
- gboolean (* pdb_dialog_set) (Gimp *gimp,
- GimpContainer *container,
- const gchar *callback_name,
- const gchar *object_name,
- va_list args);
- gboolean (* pdb_dialog_close) (Gimp *gimp,
- GimpContainer *container,
- const gchar *callback_name);
- gboolean (* recent_list_add_uri) (Gimp *gimp,
- const gchar *uri,
- const gchar *mime_type);
- void (* recent_list_load) (Gimp *gimp);
+ void (* ungrab) (Gimp *gimp);
+
+ void (* threads_enter) (Gimp *gimp);
+ void (* threads_leave) (Gimp *gimp);
+
+ void (* set_busy) (Gimp *gimp);
+ void (* unset_busy) (Gimp *gimp);
+
+ void (* show_message) (Gimp *gimp,
+ GObject *handler,
+ GimpMessageSeverity severity,
+ const gchar *domain,
+ const gchar *message);
+ void (* help) (Gimp *gimp,
+ GimpProgress *progress,
+ const gchar *help_domain,
+ const gchar *help_id);
+
+ const gchar * (* get_program_class) (Gimp *gimp);
+ gchar * (* get_display_name) (Gimp *gimp,
+ gint display_ID,
+ gint *monitor_number);
+ guint32 (* get_user_time) (Gimp *gimp);
+
+ const gchar * (* get_theme_dir) (Gimp *gimp);
+
+ GimpObject * (* get_empty_display) (Gimp *gimp);
+ GimpObject * (* display_get_by_id) (Gimp *gimp,
+ gint ID);
+ gint (* display_get_id) (GimpObject *display);
+ guint32 (* display_get_window_id) (GimpObject *display);
+ GimpObject * (* display_create) (Gimp *gimp,
+ GimpImage *image,
+ GimpUnit unit,
+ gdouble scale);
+ void (* display_delete) (GimpObject *display);
+ void (* displays_reconnect) (Gimp *gimp,
+ GimpImage *old_image,
+ GimpImage *new_image);
+
+ GimpProgress * (* progress_new) (Gimp *gimp,
+ GimpObject *display);
+ void (* progress_free) (Gimp *gimp,
+ GimpProgress *progress);
+
+ gboolean (* pdb_dialog_new) (Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ GimpContainer *container,
+ const gchar *title,
+ const gchar *callback_name,
+ const gchar *object_name,
+ va_list args);
+ gboolean (* pdb_dialog_set) (Gimp *gimp,
+ GimpContainer *container,
+ const gchar *callback_name,
+ const gchar *object_name,
+ va_list args);
+ gboolean (* pdb_dialog_close) (Gimp *gimp,
+ GimpContainer *container,
+ const gchar *callback_name);
+ gboolean (* recent_list_add_uri) (Gimp *gimp,
+ const gchar *uri,
+ const gchar *mime_type);
+ void (* recent_list_load) (Gimp *gimp);
};
-void gimp_gui_init (Gimp *gimp);
-
-void gimp_gui_ungrab (Gimp *gimp);
-
-void gimp_threads_enter (Gimp *gimp);
-void gimp_threads_leave (Gimp *gimp);
-
-GimpObject * gimp_get_empty_display (Gimp *gimp);
-GimpObject * gimp_get_display_by_ID (Gimp *gimp,
- gint ID);
-gint gimp_get_display_ID (Gimp *gimp,
- GimpObject *display);
-guint32 gimp_get_display_window (Gimp *gimp,
- GimpObject *display);
-GimpObject * gimp_create_display (Gimp *gimp,
- GimpImage *image,
- GimpUnit unit,
- gdouble scale);
-void gimp_delete_display (Gimp *gimp,
- GimpObject *display);
-void gimp_reconnect_displays (Gimp *gimp,
- GimpImage *old_image,
- GimpImage *new_image);
-
-void gimp_set_busy (Gimp *gimp);
-void gimp_set_busy_until_idle (Gimp *gimp);
-void gimp_unset_busy (Gimp *gimp);
-
-void gimp_show_message (Gimp *gimp,
- GObject *handler,
- GimpMessageSeverity severity,
- const gchar *domain,
- const gchar *message);
-void gimp_help (Gimp *gimp,
- GimpProgress *progress,
- const gchar *help_domain,
- const gchar *help_id);
-
-GimpProgress * gimp_new_progress (Gimp *gimp,
- GimpObject *display);
-void gimp_free_progress (Gimp *gimp,
- GimpProgress *progress);
-
-const gchar * gimp_get_program_class (Gimp *gimp);
-gchar * gimp_get_display_name (Gimp *gimp,
- gint display_ID,
- gint *monitor_number);
-guint32 gimp_get_user_time (Gimp *gimp);
-const gchar * gimp_get_theme_dir (Gimp *gimp);
-
-gboolean gimp_pdb_dialog_new (Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- GimpContainer *container,
- const gchar *title,
- const gchar *callback_name,
- const gchar *object_name,
- ...) G_GNUC_NULL_TERMINATED;
-gboolean gimp_pdb_dialog_set (Gimp *gimp,
- GimpContainer *container,
- const gchar *callback_name,
- const gchar *object_name,
- ...) G_GNUC_NULL_TERMINATED;
-gboolean gimp_pdb_dialog_close (Gimp *gimp,
- GimpContainer *container,
- const gchar *callback_name);
-gboolean gimp_recent_list_add_uri (Gimp *gimp,
- const gchar *uri,
- const gchar *mime_type);
-void gimp_recent_list_load (Gimp *gimp);
+void gimp_gui_init (Gimp *gimp);
+
+void gimp_gui_ungrab (Gimp *gimp);
+
+void gimp_threads_enter (Gimp *gimp);
+void gimp_threads_leave (Gimp *gimp);
+
+GimpObject * gimp_get_empty_display (Gimp *gimp);
+GimpObject * gimp_get_display_by_ID (Gimp *gimp,
+ gint ID);
+gint gimp_get_display_ID (Gimp *gimp,
+ GimpObject *display);
+guint32 gimp_get_display_window_id (Gimp *gimp,
+ GimpObject *display);
+GimpObject * gimp_create_display (Gimp *gimp,
+ GimpImage *image,
+ GimpUnit unit,
+ gdouble scale);
+void gimp_delete_display (Gimp *gimp,
+ GimpObject *display);
+void gimp_reconnect_displays (Gimp *gimp,
+ GimpImage *old_image,
+ GimpImage *new_image);
+
+void gimp_set_busy (Gimp *gimp);
+void gimp_set_busy_until_idle (Gimp *gimp);
+void gimp_unset_busy (Gimp *gimp);
+
+void gimp_show_message (Gimp *gimp,
+ GObject *handler,
+ GimpMessageSeverity severity,
+ const gchar *domain,
+ const gchar *message);
+void gimp_help (Gimp *gimp,
+ GimpProgress *progress,
+ const gchar *help_domain,
+ const gchar *help_id);
+
+GimpProgress * gimp_new_progress (Gimp *gimp,
+ GimpObject *display);
+void gimp_free_progress (Gimp *gimp,
+ GimpProgress *progress);
+
+const gchar * gimp_get_program_class (Gimp *gimp);
+gchar * gimp_get_display_name (Gimp *gimp,
+ gint display_ID,
+ gint *monitor_number);
+guint32 gimp_get_user_time (Gimp *gimp);
+const gchar * gimp_get_theme_dir (Gimp *gimp);
+
+gboolean gimp_pdb_dialog_new (Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ GimpContainer *container,
+ const gchar *title,
+ const gchar *callback_name,
+ const gchar *object_name,
+ ...) G_GNUC_NULL_TERMINATED;
+gboolean gimp_pdb_dialog_set (Gimp *gimp,
+ GimpContainer *container,
+ const gchar *callback_name,
+ const gchar *object_name,
+ ...) G_GNUC_NULL_TERMINATED;
+gboolean gimp_pdb_dialog_close (Gimp *gimp,
+ GimpContainer *container,
+ const gchar *callback_name);
+gboolean gimp_recent_list_add_uri (Gimp *gimp,
+ const gchar *uri,
+ const gchar *mime_type);
+void gimp_recent_list_load (Gimp *gimp);
#endif /* __GIMP_GUI_H__ */
diff --git a/app/core/gimppdbprogress.c b/app/core/gimppdbprogress.c
index 269826c..043783b 100644
--- a/app/core/gimppdbprogress.c
+++ b/app/core/gimppdbprogress.c
@@ -60,18 +60,18 @@ static void gimp_pdb_progress_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec);
-static GimpProgress * gimp_pdb_progress_progress_start(GimpProgress *progress,
- const gchar *message,
- gboolean cancelable);
-static void gimp_pdb_progress_progress_end (GimpProgress *progress);
-static gboolean gimp_pdb_progress_progress_is_active (GimpProgress *progress);
-static void gimp_pdb_progress_progress_set_text (GimpProgress *progress,
- const gchar *message);
-static void gimp_pdb_progress_progress_set_value (GimpProgress *progress,
- gdouble percentage);
-static gdouble gimp_pdb_progress_progress_get_value (GimpProgress *progress);
-static void gimp_pdb_progress_progress_pulse (GimpProgress *progress);
-static guint32 gimp_pdb_progress_progress_get_window (GimpProgress *progress);
+static GimpProgress * gimp_pdb_progress_progress_start (GimpProgress *progress,
+ const gchar *message,
+ gboolean cancelable);
+static void gimp_pdb_progress_progress_end (GimpProgress *progress);
+static gboolean gimp_pdb_progress_progress_is_active (GimpProgress *progress);
+static void gimp_pdb_progress_progress_set_text (GimpProgress *progress,
+ const gchar *message);
+static void gimp_pdb_progress_progress_set_value (GimpProgress *progress,
+ gdouble percentage);
+static gdouble gimp_pdb_progress_progress_get_value (GimpProgress *progress);
+static void gimp_pdb_progress_progress_pulse (GimpProgress *progress);
+static guint32 gimp_pdb_progress_progress_get_window_id (GimpProgress *progress);
static GObjectClass *parent_class = NULL;
@@ -157,14 +157,14 @@ gimp_pdb_progress_init (GimpPdbProgress *progress,
static void
gimp_pdb_progress_progress_iface_init (GimpProgressInterface *iface)
{
- iface->start = gimp_pdb_progress_progress_start;
- iface->end = gimp_pdb_progress_progress_end;
- iface->is_active = gimp_pdb_progress_progress_is_active;
- iface->set_text = gimp_pdb_progress_progress_set_text;
- iface->set_value = gimp_pdb_progress_progress_set_value;
- iface->get_value = gimp_pdb_progress_progress_get_value;
- iface->pulse = gimp_pdb_progress_progress_pulse;
- iface->get_window = gimp_pdb_progress_progress_get_window;
+ iface->start = gimp_pdb_progress_progress_start;
+ iface->end = gimp_pdb_progress_progress_end;
+ iface->is_active = gimp_pdb_progress_progress_is_active;
+ iface->set_text = gimp_pdb_progress_progress_set_text;
+ iface->set_value = gimp_pdb_progress_progress_set_value;
+ iface->get_value = gimp_pdb_progress_progress_get_value;
+ iface->pulse = gimp_pdb_progress_progress_pulse;
+ iface->get_window_id = gimp_pdb_progress_progress_get_window_id;
}
static void
@@ -388,7 +388,7 @@ gimp_pdb_progress_progress_pulse (GimpProgress *progress)
}
static guint32
-gimp_pdb_progress_progress_get_window (GimpProgress *progress)
+gimp_pdb_progress_progress_get_window_id (GimpProgress *progress)
{
GimpPdbProgress *pdb_progress = GIMP_PDB_PROGRESS (progress);
diff --git a/app/core/gimpprogress.c b/app/core/gimpprogress.c
index 190eed5..0ab58eb 100644
--- a/app/core/gimpprogress.c
+++ b/app/core/gimpprogress.c
@@ -203,7 +203,7 @@ gimp_progress_pulse (GimpProgress *progress)
}
guint32
-gimp_progress_get_window (GimpProgress *progress)
+gimp_progress_get_window_id (GimpProgress *progress)
{
GimpProgressInterface *progress_iface;
@@ -211,8 +211,8 @@ gimp_progress_get_window (GimpProgress *progress)
progress_iface = GIMP_PROGRESS_GET_INTERFACE (progress);
- if (progress_iface->get_window)
- return progress_iface->get_window (progress);
+ if (progress_iface->get_window_id)
+ return progress_iface->get_window_id (progress);
return 0;
}
diff --git a/app/core/gimpprogress.h b/app/core/gimpprogress.h
index 33f3430..ede45a9 100644
--- a/app/core/gimpprogress.h
+++ b/app/core/gimpprogress.h
@@ -35,29 +35,29 @@ struct _GimpProgressInterface
GTypeInterface base_iface;
/* virtual functions */
- GimpProgress * (* start) (GimpProgress *progress,
- const gchar *message,
- gboolean cancelable);
- void (* end) (GimpProgress *progress);
- gboolean (* is_active) (GimpProgress *progress);
-
- void (* set_text) (GimpProgress *progress,
- const gchar *message);
- void (* set_value) (GimpProgress *progress,
- gdouble percentage);
- gdouble (* get_value) (GimpProgress *progress);
- void (* pulse) (GimpProgress *progress);
-
- guint32 (* get_window) (GimpProgress *progress);
-
- gboolean (* message) (GimpProgress *progress,
- Gimp *gimp,
- GimpMessageSeverity severity,
- const gchar *domain,
- const gchar *message);
+ GimpProgress * (* start) (GimpProgress *progress,
+ const gchar *message,
+ gboolean cancelable);
+ void (* end) (GimpProgress *progress);
+ gboolean (* is_active) (GimpProgress *progress);
+
+ void (* set_text) (GimpProgress *progress,
+ const gchar *message);
+ void (* set_value) (GimpProgress *progress,
+ gdouble percentage);
+ gdouble (* get_value) (GimpProgress *progress);
+ void (* pulse) (GimpProgress *progress);
+
+ guint32 (* get_window_id) (GimpProgress *progress);
+
+ gboolean (* message) (GimpProgress *progress,
+ Gimp *gimp,
+ GimpMessageSeverity severity,
+ const gchar *domain,
+ const gchar *message);
/* signals */
- void (* cancel) (GimpProgress *progress);
+ void (* cancel) (GimpProgress *progress);
};
@@ -76,7 +76,7 @@ void gimp_progress_set_value (GimpProgress *progress,
gdouble gimp_progress_get_value (GimpProgress *progress);
void gimp_progress_pulse (GimpProgress *progress);
-guint32 gimp_progress_get_window (GimpProgress *progress);
+guint32 gimp_progress_get_window_id (GimpProgress *progress);
gboolean gimp_progress_message (GimpProgress *progress,
Gimp *gimp,
diff --git a/app/core/gimpsubprogress.c b/app/core/gimpsubprogress.c
index c2d417f..c52f0e9 100644
--- a/app/core/gimpsubprogress.c
+++ b/app/core/gimpsubprogress.c
@@ -25,26 +25,27 @@
#include "core/gimpprogress.h"
-static void gimp_sub_progress_iface_init (GimpProgressInterface *iface);
-static void gimp_sub_progress_finalize (GObject *object);
-
-static GimpProgress * gimp_sub_progress_start (GimpProgress *progress,
- const gchar *message,
- gboolean cancelable);
-static void gimp_sub_progress_end (GimpProgress *progress);
-static gboolean gimp_sub_progress_is_active (GimpProgress *progress);
-static void gimp_sub_progress_set_text (GimpProgress *progress,
- const gchar *message);
-static void gimp_sub_progress_set_value (GimpProgress *progress,
- gdouble percentage);
-static gdouble gimp_sub_progress_get_value (GimpProgress *progress);
-static void gimp_sub_progress_pulse (GimpProgress *progress);
-static guint32 gimp_sub_progress_get_window (GimpProgress *progress);
-static gboolean gimp_sub_progress_message (GimpProgress *progress,
- Gimp *gimp,
- GimpMessageSeverity severity,
- const gchar *domain,
- const gchar *message);
+static void gimp_sub_progress_iface_init (GimpProgressInterface *iface);
+
+static void gimp_sub_progress_finalize (GObject *object);
+
+static GimpProgress * gimp_sub_progress_start (GimpProgress *progress,
+ const gchar *message,
+ gboolean cancelable);
+static void gimp_sub_progress_end (GimpProgress *progress);
+static gboolean gimp_sub_progress_is_active (GimpProgress *progress);
+static void gimp_sub_progress_set_text (GimpProgress *progress,
+ const gchar *message);
+static void gimp_sub_progress_set_value (GimpProgress *progress,
+ gdouble percentage);
+static gdouble gimp_sub_progress_get_value (GimpProgress *progress);
+static void gimp_sub_progress_pulse (GimpProgress *progress);
+static guint32 gimp_sub_progress_get_window_id (GimpProgress *progress);
+static gboolean gimp_sub_progress_message (GimpProgress *progress,
+ Gimp *gimp,
+ GimpMessageSeverity severity,
+ const gchar *domain,
+ const gchar *message);
G_DEFINE_TYPE_WITH_CODE (GimpSubProgress, gimp_sub_progress, G_TYPE_OBJECT,
@@ -87,15 +88,15 @@ gimp_sub_progress_finalize (GObject *object)
static void
gimp_sub_progress_iface_init (GimpProgressInterface *iface)
{
- iface->start = gimp_sub_progress_start;
- iface->end = gimp_sub_progress_end;
- iface->is_active = gimp_sub_progress_is_active;
- iface->set_text = gimp_sub_progress_set_text;
- iface->set_value = gimp_sub_progress_set_value;
- iface->get_value = gimp_sub_progress_get_value;
- iface->pulse = gimp_sub_progress_pulse;
- iface->get_window = gimp_sub_progress_get_window;
- iface->message = gimp_sub_progress_message;
+ iface->start = gimp_sub_progress_start;
+ iface->end = gimp_sub_progress_end;
+ iface->is_active = gimp_sub_progress_is_active;
+ iface->set_text = gimp_sub_progress_set_text;
+ iface->set_value = gimp_sub_progress_set_value;
+ iface->get_value = gimp_sub_progress_get_value;
+ iface->pulse = gimp_sub_progress_pulse;
+ iface->get_window_id = gimp_sub_progress_get_window_id;
+ iface->message = gimp_sub_progress_message;
}
static GimpProgress *
@@ -163,12 +164,12 @@ gimp_sub_progress_pulse (GimpProgress *progress)
}
static guint32
-gimp_sub_progress_get_window (GimpProgress *progress)
+gimp_sub_progress_get_window_id (GimpProgress *progress)
{
GimpSubProgress *sub = GIMP_SUB_PROGRESS (progress);
if (sub->progress)
- return gimp_progress_get_window (sub->progress);
+ return gimp_progress_get_window_id (sub->progress);
return 0;
}
diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c
index 18a049a..75fd5bd 100644
--- a/app/display/gimpdisplay.c
+++ b/app/display/gimpdisplay.c
@@ -86,45 +86,44 @@ struct _GimpDisplayPrivate
/* local function prototypes */
-static void gimp_display_progress_iface_init (GimpProgressInterface *iface);
-
-static void gimp_display_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec);
-static void gimp_display_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec);
-
-static GimpProgress *
- gimp_display_progress_start (GimpProgress *progress,
- const gchar *message,
- gboolean cancelable);
-static void gimp_display_progress_end (GimpProgress *progress);
-static gboolean gimp_display_progress_is_active (GimpProgress *progress);
-static void gimp_display_progress_set_text (GimpProgress *progress,
- const gchar *message);
-static void gimp_display_progress_set_value (GimpProgress *progress,
- gdouble percentage);
-static gdouble gimp_display_progress_get_value (GimpProgress *progress);
-static void gimp_display_progress_pulse (GimpProgress *progress);
-static guint32 gimp_display_progress_get_window (GimpProgress *progress);
-static gboolean gimp_display_progress_message (GimpProgress *progress,
- Gimp *gimp,
- GimpMessageSeverity severity,
- const gchar *domain,
- const gchar *message);
-static void gimp_display_progress_canceled (GimpProgress *progress,
- GimpDisplay *display);
-
-static void gimp_display_flush_whenever (GimpDisplay *display,
- gboolean now);
-static void gimp_display_paint_area (GimpDisplay *display,
- gint x,
- gint y,
- gint w,
- gint h);
+static void gimp_display_progress_iface_init (GimpProgressInterface *iface);
+
+static void gimp_display_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gimp_display_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+static GimpProgress * gimp_display_progress_start (GimpProgress *progress,
+ const gchar *message,
+ gboolean cancelable);
+static void gimp_display_progress_end (GimpProgress *progress);
+static gboolean gimp_display_progress_is_active (GimpProgress *progress);
+static void gimp_display_progress_set_text (GimpProgress *progress,
+ const gchar *message);
+static void gimp_display_progress_set_value (GimpProgress *progress,
+ gdouble percentage);
+static gdouble gimp_display_progress_get_value (GimpProgress *progress);
+static void gimp_display_progress_pulse (GimpProgress *progress);
+static guint32 gimp_display_progress_get_window_id (GimpProgress *progress);
+static gboolean gimp_display_progress_message (GimpProgress *progress,
+ Gimp *gimp,
+ GimpMessageSeverity severity,
+ const gchar *domain,
+ const gchar *message);
+static void gimp_display_progress_canceled (GimpProgress *progress,
+ GimpDisplay *display);
+
+static void gimp_display_flush_whenever (GimpDisplay *display,
+ gboolean now);
+static void gimp_display_paint_area (GimpDisplay *display,
+ gint x,
+ gint y,
+ gint w,
+ gint h);
G_DEFINE_TYPE_WITH_CODE (GimpDisplay, gimp_display, GIMP_TYPE_OBJECT,
@@ -178,15 +177,15 @@ gimp_display_init (GimpDisplay *display)
static void
gimp_display_progress_iface_init (GimpProgressInterface *iface)
{
- iface->start = gimp_display_progress_start;
- iface->end = gimp_display_progress_end;
- iface->is_active = gimp_display_progress_is_active;
- iface->set_text = gimp_display_progress_set_text;
- iface->set_value = gimp_display_progress_set_value;
- iface->get_value = gimp_display_progress_get_value;
- iface->pulse = gimp_display_progress_pulse;
- iface->get_window = gimp_display_progress_get_window;
- iface->message = gimp_display_progress_message;
+ iface->start = gimp_display_progress_start;
+ iface->end = gimp_display_progress_end;
+ iface->is_active = gimp_display_progress_is_active;
+ iface->set_text = gimp_display_progress_set_text;
+ iface->set_value = gimp_display_progress_set_value;
+ iface->get_value = gimp_display_progress_get_value;
+ iface->pulse = gimp_display_progress_pulse;
+ iface->get_window_id = gimp_display_progress_get_window_id;
+ iface->message = gimp_display_progress_message;
}
static void
@@ -347,13 +346,13 @@ gimp_display_progress_pulse (GimpProgress *progress)
}
static guint32
-gimp_display_progress_get_window (GimpProgress *progress)
+gimp_display_progress_get_window_id (GimpProgress *progress)
{
GimpDisplay *display = GIMP_DISPLAY (progress);
GimpDisplayPrivate *private = GIMP_DISPLAY_GET_PRIVATE (display);
if (private->shell)
- return gimp_progress_get_window (GIMP_PROGRESS (private->shell));
+ return gimp_progress_get_window_id (GIMP_PROGRESS (private->shell));
return 0;
}
diff --git a/app/display/gimpdisplayshell-progress.c b/app/display/gimpdisplayshell-progress.c
index 36729e9..cc05260 100644
--- a/app/display/gimpdisplayshell-progress.c
+++ b/app/display/gimpdisplayshell-progress.c
@@ -98,12 +98,12 @@ gimp_display_shell_progress_pulse (GimpProgress *progress)
}
static guint32
-gimp_display_shell_progress_get_window (GimpProgress *progress)
+gimp_display_shell_progress_get_window_id (GimpProgress *progress)
{
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (progress));
if (GTK_IS_WINDOW (toplevel))
- return (guint32) gimp_window_get_native (GTK_WINDOW (toplevel));
+ return gimp_window_get_native_id (GTK_WINDOW (toplevel));
return 0;
}
@@ -147,13 +147,13 @@ gimp_display_shell_progress_message (GimpProgress *progress,
void
gimp_display_shell_progress_iface_init (GimpProgressInterface *iface)
{
- iface->start = gimp_display_shell_progress_start;
- iface->end = gimp_display_shell_progress_end;
- iface->is_active = gimp_display_shell_progress_is_active;
- iface->set_text = gimp_display_shell_progress_set_text;
- iface->set_value = gimp_display_shell_progress_set_value;
- iface->get_value = gimp_display_shell_progress_get_value;
- iface->pulse = gimp_display_shell_progress_pulse;
- iface->get_window = gimp_display_shell_progress_get_window;
- iface->message = gimp_display_shell_progress_message;
+ iface->start = gimp_display_shell_progress_start;
+ iface->end = gimp_display_shell_progress_end;
+ iface->is_active = gimp_display_shell_progress_is_active;
+ iface->set_text = gimp_display_shell_progress_set_text;
+ iface->set_value = gimp_display_shell_progress_set_value;
+ iface->get_value = gimp_display_shell_progress_get_value;
+ iface->pulse = gimp_display_shell_progress_pulse;
+ iface->get_window_id = gimp_display_shell_progress_get_window_id;
+ iface->message = gimp_display_shell_progress_message;
}
diff --git a/app/gui/gui-message.c b/app/gui/gui-message.c
index 863b1ca..3b1d159 100644
--- a/app/gui/gui-message.c
+++ b/app/gui/gui-message.c
@@ -160,10 +160,10 @@ progress_error_dialog (GimpProgress *progress)
}
else
{
- guint32 window = gimp_progress_get_window (progress);
+ guint32 window_id = gimp_progress_get_window_id (progress);
- if (window)
- gimp_window_set_transient_for (GTK_WINDOW (dialog), window);
+ if (window_id)
+ gimp_window_set_transient_for (GTK_WINDOW (dialog), window_id);
}
}
diff --git a/app/gui/gui-vtable.c b/app/gui/gui-vtable.c
index 023e3b8..2207a6f 100644
--- a/app/gui/gui-vtable.c
+++ b/app/gui/gui-vtable.c
@@ -77,59 +77,59 @@
/* local function prototypes */
-static void gui_ungrab (Gimp *gimp);
-
-static void gui_threads_enter (Gimp *gimp);
-static void gui_threads_leave (Gimp *gimp);
-static void gui_set_busy (Gimp *gimp);
-static void gui_unset_busy (Gimp *gimp);
-static void gui_help (Gimp *gimp,
- GimpProgress *progress,
- const gchar *help_domain,
- const gchar *help_id);
-static const gchar * gui_get_program_class (Gimp *gimp);
-static gchar * gui_get_display_name (Gimp *gimp,
- gint display_ID,
- gint *monitor_number);
-static guint32 gui_get_user_time (Gimp *gimp);
-static const gchar * gui_get_theme_dir (Gimp *gimp);
-static GimpObject * gui_get_empty_display (Gimp *gimp);
-static GimpObject * gui_display_get_by_ID (Gimp *gimp,
- gint ID);
-static gint gui_display_get_ID (GimpObject *display);
-static guint32 gui_display_get_window (GimpObject *display);
-static GimpObject * gui_display_create (Gimp *gimp,
- GimpImage *image,
- GimpUnit unit,
- gdouble scale);
-static void gui_display_delete (GimpObject *display);
-static void gui_displays_reconnect (Gimp *gimp,
- GimpImage *old_image,
- GimpImage *new_image);
-static GimpProgress * gui_new_progress (Gimp *gimp,
- GimpObject *display);
-static void gui_free_progress (Gimp *gimp,
- GimpProgress *progress);
-static gboolean gui_pdb_dialog_new (Gimp *gimp,
- GimpContext *context,
- GimpProgress *progress,
- GimpContainer *container,
- const gchar *title,
- const gchar *callback_name,
- const gchar *object_name,
- va_list args);
-static gboolean gui_pdb_dialog_set (Gimp *gimp,
- GimpContainer *container,
- const gchar *callback_name,
- const gchar *object_name,
- va_list args);
-static gboolean gui_pdb_dialog_close (Gimp *gimp,
- GimpContainer *container,
- const gchar *callback_name);
-static gboolean gui_recent_list_add_uri (Gimp *gimp,
- const gchar *uri,
- const gchar *mime_type);
-static void gui_recent_list_load (Gimp *gimp);
+static void gui_ungrab (Gimp *gimp);
+
+static void gui_threads_enter (Gimp *gimp);
+static void gui_threads_leave (Gimp *gimp);
+static void gui_set_busy (Gimp *gimp);
+static void gui_unset_busy (Gimp *gimp);
+static void gui_help (Gimp *gimp,
+ GimpProgress *progress,
+ const gchar *help_domain,
+ const gchar *help_id);
+static const gchar * gui_get_program_class (Gimp *gimp);
+static gchar * gui_get_display_name (Gimp *gimp,
+ gint display_ID,
+ gint *monitor_number);
+static guint32 gui_get_user_time (Gimp *gimp);
+static const gchar * gui_get_theme_dir (Gimp *gimp);
+static GimpObject * gui_get_empty_display (Gimp *gimp);
+static GimpObject * gui_display_get_by_ID (Gimp *gimp,
+ gint ID);
+static gint gui_display_get_ID (GimpObject *display);
+static guint32 gui_display_get_window_id (GimpObject *display);
+static GimpObject * gui_display_create (Gimp *gimp,
+ GimpImage *image,
+ GimpUnit unit,
+ gdouble scale);
+static void gui_display_delete (GimpObject *display);
+static void gui_displays_reconnect (Gimp *gimp,
+ GimpImage *old_image,
+ GimpImage *new_image);
+static GimpProgress * gui_new_progress (Gimp *gimp,
+ GimpObject *display);
+static void gui_free_progress (Gimp *gimp,
+ GimpProgress *progress);
+static gboolean gui_pdb_dialog_new (Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ GimpContainer *container,
+ const gchar *title,
+ const gchar *callback_name,
+ const gchar *object_name,
+ va_list args);
+static gboolean gui_pdb_dialog_set (Gimp *gimp,
+ GimpContainer *container,
+ const gchar *callback_name,
+ const gchar *object_name,
+ va_list args);
+static gboolean gui_pdb_dialog_close (Gimp *gimp,
+ GimpContainer *container,
+ const gchar *callback_name);
+static gboolean gui_recent_list_add_uri (Gimp *gimp,
+ const gchar *uri,
+ const gchar *mime_type);
+static void gui_recent_list_load (Gimp *gimp);
/* public functions */
@@ -139,31 +139,31 @@ gui_vtable_init (Gimp *gimp)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
- gimp->gui.ungrab = gui_ungrab;
- gimp->gui.threads_enter = gui_threads_enter;
- gimp->gui.threads_leave = gui_threads_leave;
- gimp->gui.set_busy = gui_set_busy;
- gimp->gui.unset_busy = gui_unset_busy;
- gimp->gui.show_message = gui_message;
- gimp->gui.help = gui_help;
- gimp->gui.get_program_class = gui_get_program_class;
- gimp->gui.get_display_name = gui_get_display_name;
- gimp->gui.get_user_time = gui_get_user_time;
- gimp->gui.get_theme_dir = gui_get_theme_dir;
- gimp->gui.get_empty_display = gui_get_empty_display;
- gimp->gui.display_get_by_id = gui_display_get_by_ID;
- gimp->gui.display_get_id = gui_display_get_ID;
- gimp->gui.display_get_window = gui_display_get_window;
- gimp->gui.display_create = gui_display_create;
- gimp->gui.display_delete = gui_display_delete;
- gimp->gui.displays_reconnect = gui_displays_reconnect;
- gimp->gui.progress_new = gui_new_progress;
- gimp->gui.progress_free = gui_free_progress;
- gimp->gui.pdb_dialog_new = gui_pdb_dialog_new;
- gimp->gui.pdb_dialog_set = gui_pdb_dialog_set;
- gimp->gui.pdb_dialog_close = gui_pdb_dialog_close;
- gimp->gui.recent_list_add_uri = gui_recent_list_add_uri;
- gimp->gui.recent_list_load = gui_recent_list_load;
+ gimp->gui.ungrab = gui_ungrab;
+ gimp->gui.threads_enter = gui_threads_enter;
+ gimp->gui.threads_leave = gui_threads_leave;
+ gimp->gui.set_busy = gui_set_busy;
+ gimp->gui.unset_busy = gui_unset_busy;
+ gimp->gui.show_message = gui_message;
+ gimp->gui.help = gui_help;
+ gimp->gui.get_program_class = gui_get_program_class;
+ gimp->gui.get_display_name = gui_get_display_name;
+ gimp->gui.get_user_time = gui_get_user_time;
+ gimp->gui.get_theme_dir = gui_get_theme_dir;
+ gimp->gui.get_empty_display = gui_get_empty_display;
+ gimp->gui.display_get_by_id = gui_display_get_by_ID;
+ gimp->gui.display_get_id = gui_display_get_ID;
+ gimp->gui.display_get_window_id = gui_display_get_window_id;
+ gimp->gui.display_create = gui_display_create;
+ gimp->gui.display_delete = gui_display_delete;
+ gimp->gui.displays_reconnect = gui_displays_reconnect;
+ gimp->gui.progress_new = gui_new_progress;
+ gimp->gui.progress_free = gui_free_progress;
+ gimp->gui.pdb_dialog_new = gui_pdb_dialog_new;
+ gimp->gui.pdb_dialog_set = gui_pdb_dialog_set;
+ gimp->gui.pdb_dialog_close = gui_pdb_dialog_close;
+ gimp->gui.recent_list_add_uri = gui_recent_list_add_uri;
+ gimp->gui.recent_list_load = gui_recent_list_load;
}
@@ -311,7 +311,7 @@ gui_display_get_ID (GimpObject *display)
}
static guint32
-gui_display_get_window (GimpObject *display)
+gui_display_get_window_id (GimpObject *display)
{
GimpDisplay *disp = GIMP_DISPLAY (display);
GimpDisplayShell *shell = gimp_display_get_shell (disp);
@@ -321,7 +321,7 @@ gui_display_get_window (GimpObject *display)
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
if (GTK_IS_WINDOW (toplevel))
- return (guint32) gimp_window_get_native (GTK_WINDOW (toplevel));
+ return gimp_window_get_native_id (GTK_WINDOW (toplevel));
}
return 0;
@@ -499,10 +499,10 @@ gui_pdb_dialog_new (Gimp *gimp,
if (progress)
{
- guint32 window = gimp_progress_get_window (progress);
+ guint32 window_id = gimp_progress_get_window_id (progress);
- if (window)
- gimp_window_set_transient_for (GTK_WINDOW (dialog), window);
+ if (window_id)
+ gimp_window_set_transient_for (GTK_WINDOW (dialog), window_id);
}
gtk_widget_show (dialog);
diff --git a/app/pdb/display-cmds.c b/app/pdb/display-cmds.c
index 9c2c898..28619e1 100644
--- a/app/pdb/display-cmds.c
+++ b/app/pdb/display-cmds.c
@@ -136,7 +136,7 @@ display_get_window_handle_invoker (GimpProcedure *procedure,
if (success)
{
- window = (gint32) gimp_get_display_window (gimp, display);
+ window = (gint32) gimp_get_display_window_id (gimp, display);
}
return_vals = gimp_procedure_get_return_values (procedure, success,
diff --git a/app/pdb/progress-cmds.c b/app/pdb/progress-cmds.c
index d72bb2c..8fa2469 100644
--- a/app/pdb/progress-cmds.c
+++ b/app/pdb/progress-cmds.c
@@ -190,7 +190,7 @@ progress_get_window_handle_invoker (GimpProcedure *procedure,
if (plug_in && plug_in->open)
{
if (! gimp->no_interface)
- window = gimp_plug_in_progress_get_window (plug_in);
+ window = gimp_plug_in_progress_get_window_id (plug_in);
}
else
success = FALSE;
diff --git a/app/plug-in/gimpplugin-progress.c b/app/plug-in/gimpplugin-progress.c
index ce6f1ae..5d45fb6 100644
--- a/app/plug-in/gimpplugin-progress.c
+++ b/app/plug-in/gimpplugin-progress.c
@@ -224,7 +224,7 @@ gimp_plug_in_progress_pulse (GimpPlugIn *plug_in)
}
guint32
-gimp_plug_in_progress_get_window (GimpPlugIn *plug_in)
+gimp_plug_in_progress_get_window_id (GimpPlugIn *plug_in)
{
GimpPlugInProcFrame *proc_frame;
@@ -233,7 +233,7 @@ gimp_plug_in_progress_get_window (GimpPlugIn *plug_in)
proc_frame = gimp_plug_in_get_proc_frame (plug_in);
if (proc_frame->progress)
- return gimp_progress_get_window (proc_frame->progress);
+ return gimp_progress_get_window_id (proc_frame->progress);
return 0;
}
diff --git a/app/plug-in/gimpplugin-progress.h b/app/plug-in/gimpplugin-progress.h
index 35606af..ad071f7 100644
--- a/app/plug-in/gimpplugin-progress.h
+++ b/app/plug-in/gimpplugin-progress.h
@@ -21,27 +21,27 @@
#define __GIMP_PLUG_IN_PROGRESS_H__
-gint gimp_plug_in_progress_attach (GimpProgress *progress);
-gint gimp_plug_in_progress_detach (GimpProgress *progress);
+gint gimp_plug_in_progress_attach (GimpProgress *progress);
+gint gimp_plug_in_progress_detach (GimpProgress *progress);
-void gimp_plug_in_progress_start (GimpPlugIn *plug_in,
- const gchar *message,
- GimpObject *display);
-void gimp_plug_in_progress_end (GimpPlugIn *plug_in,
- GimpPlugInProcFrame *proc_frame);
-void gimp_plug_in_progress_set_text (GimpPlugIn *plug_in,
- const gchar *message);
-void gimp_plug_in_progress_set_value (GimpPlugIn *plug_in,
- gdouble percentage);
-void gimp_plug_in_progress_pulse (GimpPlugIn *plug_in);
-guint32 gimp_plug_in_progress_get_window (GimpPlugIn *plug_in);
+void gimp_plug_in_progress_start (GimpPlugIn *plug_in,
+ const gchar *message,
+ GimpObject *display);
+void gimp_plug_in_progress_end (GimpPlugIn *plug_in,
+ GimpPlugInProcFrame *proc_frame);
+void gimp_plug_in_progress_set_text (GimpPlugIn *plug_in,
+ const gchar *message);
+void gimp_plug_in_progress_set_value (GimpPlugIn *plug_in,
+ gdouble percentage);
+void gimp_plug_in_progress_pulse (GimpPlugIn *plug_in);
+guint32 gimp_plug_in_progress_get_window_id (GimpPlugIn *plug_in);
-gboolean gimp_plug_in_progress_install (GimpPlugIn *plug_in,
- const gchar *progress_callback);
-gboolean gimp_plug_in_progress_uninstall (GimpPlugIn *plug_in,
- const gchar *progress_callback);
-gboolean gimp_plug_in_progress_cancel (GimpPlugIn *plug_in,
- const gchar *progress_callback);
+gboolean gimp_plug_in_progress_install (GimpPlugIn *plug_in,
+ const gchar *progress_callback);
+gboolean gimp_plug_in_progress_uninstall (GimpPlugIn *plug_in,
+ const gchar *progress_callback);
+gboolean gimp_plug_in_progress_cancel (GimpPlugIn *plug_in,
+ const gchar *progress_callback);
#endif /* __GIMP_PLUG_IN_PROGRESS_H__ */
diff --git a/app/widgets/gimpfiledialog.c b/app/widgets/gimpfiledialog.c
index 37fb0f2..914b5cd 100644
--- a/app/widgets/gimpfiledialog.c
+++ b/app/widgets/gimpfiledialog.c
@@ -86,7 +86,7 @@ static void gimp_file_dialog_progress_set_value (GimpProgress *progr
gdouble percentage);
static gdouble gimp_file_dialog_progress_get_value (GimpProgress *progress);
static void gimp_file_dialog_progress_pulse (GimpProgress *progress);
-static guint32 gimp_file_dialog_progress_get_window (GimpProgress *progress);
+static guint32 gimp_file_dialog_progress_get_window_id (GimpProgress *progress);
static void gimp_file_dialog_add_user_dir (GimpFileDialog *dialog,
GUserDirectory directory);
@@ -155,14 +155,14 @@ gimp_file_dialog_init (GimpFileDialog *dialog)
static void
gimp_file_dialog_progress_iface_init (GimpProgressInterface *iface)
{
- iface->start = gimp_file_dialog_progress_start;
- iface->end = gimp_file_dialog_progress_end;
- iface->is_active = gimp_file_dialog_progress_is_active;
- iface->set_text = gimp_file_dialog_progress_set_text;
- iface->set_value = gimp_file_dialog_progress_set_value;
- iface->get_value = gimp_file_dialog_progress_get_value;
- iface->pulse = gimp_file_dialog_progress_pulse;
- iface->get_window = gimp_file_dialog_progress_get_window;
+ iface->start = gimp_file_dialog_progress_start;
+ iface->end = gimp_file_dialog_progress_end;
+ iface->is_active = gimp_file_dialog_progress_is_active;
+ iface->set_text = gimp_file_dialog_progress_set_text;
+ iface->set_value = gimp_file_dialog_progress_set_value;
+ iface->get_value = gimp_file_dialog_progress_get_value;
+ iface->pulse = gimp_file_dialog_progress_pulse;
+ iface->get_window_id = gimp_file_dialog_progress_get_window_id;
}
static void
@@ -286,11 +286,11 @@ gimp_file_dialog_progress_pulse (GimpProgress *progress)
}
static guint32
-gimp_file_dialog_progress_get_window (GimpProgress *progress)
+gimp_file_dialog_progress_get_window_id (GimpProgress *progress)
{
GimpFileDialog *dialog = GIMP_FILE_DIALOG (progress);
- return (guint32) gimp_window_get_native (GTK_WINDOW (dialog));
+ return gimp_window_get_native_id (GTK_WINDOW (dialog));
}
diff --git a/app/widgets/gimphelp.c b/app/widgets/gimphelp.c
index f307d0f..e817ad9 100644
--- a/app/widgets/gimphelp.c
+++ b/app/widgets/gimphelp.c
@@ -372,10 +372,10 @@ gimp_help_browser_error (Gimp *gimp,
if (progress)
{
- guint32 window = gimp_progress_get_window (progress);
+ guint32 window_id = gimp_progress_get_window_id (progress);
- if (window)
- gimp_window_set_transient_for (GTK_WINDOW (dialog), window);
+ if (window_id)
+ gimp_window_set_transient_for (GTK_WINDOW (dialog), window_id);
}
gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
@@ -627,10 +627,10 @@ gimp_help_query_user_manual_online (GimpIdleHelp *idle_help)
if (idle_help->progress)
{
- guint32 window = gimp_progress_get_window (idle_help->progress);
+ guint32 window_id = gimp_progress_get_window_id (idle_help->progress);
- if (window)
- gimp_window_set_transient_for (GTK_WINDOW (dialog), window);
+ if (window_id)
+ gimp_window_set_transient_for (GTK_WINDOW (dialog), window_id);
}
g_signal_connect (dialog, "response",
diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c
index 21df3d7..3fe934f 100644
--- a/app/widgets/gimpwidgets-utils.c
+++ b/app/widgets/gimpwidgets-utils.c
@@ -822,17 +822,17 @@ gimp_window_set_hint (GtkWindow *window,
}
/**
- * gimp_window_get_native:
+ * gimp_window_get_native_id:
* @window: a #GtkWindow
*
* This function is used to pass a window handle to plug-ins so that
* they can set their dialog windows transient to the parent window.
*
- * Return value: a native window handle of the window's #GdkWindow or 0
+ * Return value: a native window ID of the window's #GdkWindow or 0
* if the window isn't realized yet
*/
-GdkNativeWindow
-gimp_window_get_native (GtkWindow *window)
+guint32
+gimp_window_get_native_id (GtkWindow *window)
{
g_return_val_if_fail (GTK_IS_WINDOW (window), 0);
@@ -840,12 +840,12 @@ gimp_window_get_native (GtkWindow *window)
#ifdef __GNUC__
#warning gimp_window_get_native() unimplementable for the target windowing system
#endif
- return (GdkNativeWindow)0;
+ return 0;
#endif
#ifdef GDK_WINDOWING_WIN32
if (window && gtk_widget_get_realized (GTK_WIDGET (window)))
- return (GdkNativeWindow) GDK_WINDOW_HWND (gtk_widget_get_window (GTK_WIDGET (window)));
+ return GDK_WINDOW_HWND (gtk_widget_get_window (GTK_WIDGET (window)));
#endif
#ifdef GDK_WINDOWING_X11
@@ -853,7 +853,7 @@ gimp_window_get_native (GtkWindow *window)
return GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window)));
#endif
- return (GdkNativeWindow) 0;
+ return 0;
}
static void
diff --git a/app/widgets/gimpwidgets-utils.h b/app/widgets/gimpwidgets-utils.h
index 48df46e..2468f0d 100644
--- a/app/widgets/gimpwidgets-utils.h
+++ b/app/widgets/gimpwidgets-utils.h
@@ -69,7 +69,7 @@ void gimp_rgb_set_gdk_color (GimpRGB *rgb,
const GdkColor *gdk_color);
void gimp_window_set_hint (GtkWindow *window,
GimpWindowHint hint);
-GdkNativeWindow gimp_window_get_native (GtkWindow *window);
+guint32 gimp_window_get_native_id (GtkWindow *window);
void gimp_window_set_transient_for (GtkWindow *window,
guint32 parent_ID);
void gimp_toggle_button_set_visible (GtkToggleButton *toggle,
diff --git a/libgimp/gimpprogressbar.c b/libgimp/gimpprogressbar.c
index 73ae666..7ce1fab 100644
--- a/libgimp/gimpprogressbar.c
+++ b/libgimp/gimpprogressbar.c
@@ -176,8 +176,8 @@ gimp_progress_bar_pulse (gpointer user_data)
gtk_main_iteration ();
}
-static GdkNativeWindow
-gimp_window_get_native (GtkWindow *window)
+static guint32
+gimp_window_get_native_id (GtkWindow *window)
{
g_return_val_if_fail (GTK_IS_WINDOW (window), 0);
@@ -209,7 +209,7 @@ gimp_progress_bar_get_window (gpointer user_data)
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (bar));
if (GTK_IS_WINDOW (toplevel))
- return (guint32) gimp_window_get_native (GTK_WINDOW (toplevel));
+ return gimp_window_get_native_id (GTK_WINDOW (toplevel));
return 0;
}
diff --git a/tools/pdbgen/pdb/display.pdb b/tools/pdbgen/pdb/display.pdb
index 168cdfd..ca0fa6b 100644
--- a/tools/pdbgen/pdb/display.pdb
+++ b/tools/pdbgen/pdb/display.pdb
@@ -141,7 +141,7 @@ HELP
%invoke = (
code => <<'CODE'
{
- window = (gint32) gimp_get_display_window (gimp, display);
+ window = (gint32) gimp_get_display_window_id (gimp, display);
}
CODE
);
diff --git a/tools/pdbgen/pdb/progress.pdb b/tools/pdbgen/pdb/progress.pdb
index 8cd57fc..c57da29 100644
--- a/tools/pdbgen/pdb/progress.pdb
+++ b/tools/pdbgen/pdb/progress.pdb
@@ -197,7 +197,7 @@ HELP
if (plug_in && plug_in->open)
{
if (! gimp->no_interface)
- window = gimp_plug_in_progress_get_window (plug_in);
+ window = gimp_plug_in_progress_get_window_id (plug_in);
}
else
success = FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
