*** empty log message ***

ChangeLog

@@ -1,3 +1,8 @@
+Thu May 13 19:17:58 CEST 1999 Marc Lehmann <pcg@goof.com>
+
+	* 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  <austin@gimp.org>
 
 	* 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 <yosh@gimp.org>
 
 	* tools/pdbgen/*: minor cleanups (no functional changes)
 
+>>>>>>> 1.1106
 Wed May 12 15:14:25 EEST 1999 Lauri Alanko <nether@gimp.org>
 
 	* plug-ins/gfig/gfig.c: Updated calls to gimp_paintbrush to its

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)

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.

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 */

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 */

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 */