From e84bd1cfd36c614f3139ba62ec596b88bd2be45b Mon Sep 17 00:00:00 2001 From: Marc Lehmann Date: Sun, 16 May 1999 20:22:33 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 6 ++++++ libgimp/gimp.c | 6 ++++++ libgimp/gimp.h | 4 ++++ libgimp/gimpfeatures.h.in | 2 ++ libgimp/gimpfeatures.h.win32 | 2 ++ libgimpbase/gimpversion.h.in | 2 ++ 6 files changed, 22 insertions(+) diff --git a/ChangeLog b/ChangeLog index a8179f05cd..cf51c82858 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu May 13 19:17:58 CEST 1999 Marc Lehmann + + * libgimp/gimp.[ch]: implement gimp_default_display. + * libgimp/gimpfeatures.h: add feature test macro for the above. + Sun May 16 18:23:12 BST 1999 Austin Donnelly * app/module_db.c: We weren't initialising refs variable before using @@ -153,6 +158,7 @@ Wed May 12 12:13:57 PDT 1999 Manish Singh * tools/pdbgen/*: minor cleanups (no functional changes) +>>>>>>> 1.1106 Wed May 12 15:14:25 EEST 1999 Lauri Alanko * plug-ins/gfig/gfig.c: Updated calls to gimp_paintbrush to its diff --git a/libgimp/gimp.c b/libgimp/gimp.c index 1ce8b15fef..3939bccca3 100644 --- a/libgimp/gimp.c +++ b/libgimp/gimp.c @@ -331,6 +331,12 @@ gimp_progress_update (gdouble percentage) gimp_destroy_params (return_vals, nreturn_vals); } +gint32 +gimp_default_display (void) +{ + return _gdisp_ID; +} + void gimp_message (const gchar *message) diff --git a/libgimp/gimp.h b/libgimp/gimp.h index 5b3f494fab..347b218ac4 100644 --- a/libgimp/gimp.h +++ b/libgimp/gimp.h @@ -271,6 +271,10 @@ void gimp_progress_init (char *message); */ void gimp_progress_update (gdouble percentage); +/* Returns the default gdisplay (given at plug-in config time). + */ +gint32 gimp_default_display (void); + /* Pops up a dialog box with "message". Useful for status and * error reports. If "message" is NULL, do nothing. diff --git a/libgimp/gimpfeatures.h.in b/libgimp/gimpfeatures.h.in index bedf7a01e5..6ce9a9b72c 100644 --- a/libgimp/gimpfeatures.h.in +++ b/libgimp/gimpfeatures.h.in @@ -42,6 +42,8 @@ extern "C" { #define GIMP_HAVE_FEATURES_1_1_5 1-1-5 +#define GIMP_HAVE_DEFAULT_DISPLAY 1-1-5 + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimp/gimpfeatures.h.win32 b/libgimp/gimpfeatures.h.win32 index 50d9c9a6cf..19574e1610 100644 --- a/libgimp/gimpfeatures.h.win32 +++ b/libgimp/gimpfeatures.h.win32 @@ -42,6 +42,8 @@ extern "C" { #define GIMP_HAVE_FEATURES_1_1_5 1-1-5 +#define GIMP_HAVE_DEFAULT_DISPLAY 1-1-5 + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimpbase/gimpversion.h.in b/libgimpbase/gimpversion.h.in index bedf7a01e5..6ce9a9b72c 100644 --- a/libgimpbase/gimpversion.h.in +++ b/libgimpbase/gimpversion.h.in @@ -42,6 +42,8 @@ extern "C" { #define GIMP_HAVE_FEATURES_1_1_5 1-1-5 +#define GIMP_HAVE_DEFAULT_DISPLAY 1-1-5 + #ifdef __cplusplus } #endif /* __cplusplus */