updated

2002-11-30  Hans Breuer  <hans@breuer.org>

	* */makefile.msc */*/makefile.msc : updated

	* themes/Default/images/makefile.msc : new file
	* themes/Default/makefile.msc : removed

	* libgimpwidgets/gimpwidgets.def : updated

	* app/core/core-types.h : renamed PIXELS and POINTS
	to SIZE_* to avoid clashes with system headers
	* app/pdb/text_tool_cmds.c : updated ...
	* tools/pdbgen/enums.py : ... by renaming here too.

	* app/widgets/gimphistogrambox.c : <string.h> for memcpy()
	* app/widgets/gimppropwidgets.c : <string.h> for strlen()

	* app/config/gimpconfig.c : on win32 rename always fails
	if the destination file exists. Delete it first.

	* libgimp/gimp.def : removed all '_'-prefixed exports
	* plug-ins/common/iwarp.c : replace _gimp_layer_copy()
	with gimp_layer_copy(), gimp_layer_add_alpha()

	* libgimp/gimpmisc.c : ported gimp_timer funcs to use
	g_timer to be more portable

	* libgimpbase/gimpdatafiles.c : there are no symlinks on
	win32, inverted to #ifndef G_OS_WIN32 as it was meant.

	* libgimpbase/gimpbase.def libgimpmodule/gimpmodule.def
	  libgimpwidgets/gimpwidgets.def : updated externals

	* plug-ins/common/randomize.c plug-ins/common/sinus.c :
	don't initialize more than the defined struct size

	* plug-ins/common/warp.c : removed unneeded unistd.h and
	signal.h include

	* regexrepl/regexrepl.def : (new file) needed to build
	as DLL

ChangeLog

@@ -1,3 +1,45 @@
+2002-11-30  Hans Breuer  <hans@breuer.org>
+
+	* */makefile.msc */*/makefile.msc : updated
+
+	* themes/Default/images/makefile.msc : new file
+	* themes/Default/makefile.msc : removed
+
+	* libgimpwidgets/gimpwidgets.def : updated
+
+	* app/core/core-types.h : renamed PIXELS and POINTS
+	to SIZE_* to avoid clashes with system headers
+	* app/pdb/text_tool_cmds.c : updated ...
+	* tools/pdbgen/enums.py : ... by renaming here too.
+
+	* app/widgets/gimphistogrambox.c : <string.h> for memcpy()
+	* app/widgets/gimppropwidgets.c : <string.h> for strlen()
+
+	* app/config/gimpconfig.c : on win32 rename always fails
+	if the destination file exists. Delete it first.
+
+	* libgimp/gimp.def : removed all '_'-prefixed exports
+	* plug-ins/common/iwarp.c : replace _gimp_layer_copy()
+	with gimp_layer_copy(), gimp_layer_add_alpha()
+
+	* libgimp/gimpmisc.c : ported gimp_timer funcs to use
+	g_timer to be more portable
+
+	* libgimpbase/gimpdatafiles.c : there are no symlinks on 
+	win32, inverted to #ifndef G_OS_WIN32 as it was meant.
+
+	* libgimpbase/gimpbase.def libgimpmodule/gimpmodule.def 
+	  libgimpwidgets/gimpwidgets.def : updated externals
+
+	* plug-ins/common/randomize.c plug-ins/common/sinus.c :
+	don't initialize more than the defined struct size
+
+	* plug-ins/common/warp.c : removed unneeded unistd.h and
+	signal.h include
+
+	* regexrepl/regexrepl.def : (new file) needed to build 
+	as DLL
+
 2002-12-01  Michael Natterer  <mitch@gimp.org>
 
 	* app/core/gimp.[ch]: added "gboolean use_shm" to the Gimp struct

app/base/makefile.msc

@@ -14,7 +14,6 @@ PKG_LINK = \
 
 OBJECTS = \
 	base.obj \
-	base-config.obj \
 	base-enums.obj \
 	boundary.obj \
 	brush-scale.obj \
@@ -45,7 +44,9 @@ INCLUDES = \
 all : \
 	$(PRJ_TOP)\config.h \
 	$(PACKAGE).lib \
+!IFDEF DLLGIMP
 	$(PACKAGE)-$(PKG_VER).dll
+!ENDIF
 
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32

app/config/gimpconfig.c

@@ -261,6 +261,12 @@ gimp_config_serialize (GObject      *object,
 
   close (fd);
 
+#ifdef G_OS_WIN32
+  /* win32 rename can't overwrite */
+  if (success)
+    unlink (filename);
+#endif
+
   if (success && rename (tmpname, filename) == -1)
     {
       g_set_error (error, 

app/config/makefile.msc

@@ -8,7 +8,7 @@ PKG_VER = 1.3
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
 PKG_LINK = \
-	..\base\appbase-$(PKG_VER).lib \
+#	..\base\appbase-$(PKG_VER).lib \
 #	..\core\appcore-$(PKG_VER).lib \
 	..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib \
 	..\..\libgimpbase\gimpbase-$(PKG_VER).lib \

app/core/core-types.h

@@ -54,8 +54,8 @@ typedef enum /*< pdb-skip >*/
 
 typedef enum
 {
-  PIXELS,
-  POINTS
+  SIZE_PIXELS,
+  SIZE_POINTS
 } SizeType;
 
 typedef enum /*< pdb-skip >*/ /*< skip >*/

app/core/makefile.msc

@@ -29,10 +29,8 @@ OBJECTS = \
 	gimpchannel.obj \
 	gimpcontainer.obj \
 	gimpcontext.obj \
-	gimpcoreconfig.obj \
 	gimpdata.obj \
 	gimpdatafactory.obj \
-	gimpdatafiles.obj \
 	gimpdatalist.obj \
 	gimp-documents.obj \
 	gimpdocumentlist.obj \
@@ -48,6 +46,7 @@ OBJECTS = \
 	gimpdrawable-transform.obj \
 	gimpdrawable-transform-utils.obj \
 	gimpedit.obj \
+	gimpenvirontable.obj \
 	gimpgradient.obj \
 	gimp-gradients.obj \
 	gimpimage.obj \
@@ -67,6 +66,7 @@ OBJECTS = \
 	gimpimage-qmask.obj \
 	gimpimage-resize.obj \
 	gimpimage-scale.obj \
+	gimpimage-text.obj \
 	gimpimage-undo.obj \
 	gimpimagefile.obj \
 	gimpitem.obj \
@@ -75,7 +75,6 @@ OBJECTS = \
 	gimplayermask.obj \
 	gimplist.obj \
 	gimpmarshal.obj \
-	gimpmoduleinfo.obj \
 	gimpmodules.obj \
 	gimpobject.obj \
 	gimppaintinfo.obj \
@@ -86,6 +85,7 @@ OBJECTS = \
 	gimppattern.obj \
 	gimppreviewcache.obj \
 	gimpscanconvert.obj \
+	gimptext.obj \
 	gimptoolinfo.obj \
 	gimpundo.obj \
 	gimpundostack.obj \
@@ -109,7 +109,7 @@ INCLUDES = \
 	-FImsvc_recommended_pragmas.h \
 	-I$(PRJ_TOP) \
 	-I$(PRJ_TOP)/app \
-	$(GTK2_CFLAGS) \
+	$(GTK2_CFLAGS) $(FREETYPE2_CFLAGS) \
 	$(LIBART_CFLAGS) \
 
 DEFINES = \

app/gui/makefile.msc

@@ -31,8 +31,8 @@ OBJECTS = \
 	buffers-commands.obj \
 	channels-commands.obj \
 	colormap-editor-commands.obj \
+	color-history.obj \
 	color-notebook.obj \
-	color-select.obj \
 	convert-dialog.obj \
 	data-commands.obj \
 	device-status-dialog.obj \

app/makefile.msc

@@ -47,6 +47,7 @@ PKG_LINK = \
 	$(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \
 	$(top_builddir)/libgimpmath/gimpmath-$(LT_RELEASE).lib \
 	$(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \
+	$(top_builddir)/libgimpmodule/gimpmodule-$(LT_RELEASE).lib \
 	$(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \
 	$(GLIB_LIBS) \
 	$(GTK2_LIBS) \
@@ -74,8 +75,6 @@ mmx_sources = \
 OBJECTS = \
 	ops_buttons.obj \
 	undo_history.obj \
-	general.obj \
-	gimprc.obj \
 	path.obj \
 	path_curves.obj \
 	path_bezier.obj \
@@ -87,9 +86,6 @@ OBJECTS = \
 	libgimp_glue.obj \
 
 
-regexrepl.obj : regexrepl.c regexrepl.h
-	$(CC) $(CFLAGS) -GD -c -DREGEX_MALLOC -DHAVE_STRING_H $(PKG_CFLAGS) regexrepl.c
-
 EXTRA_DIST = \
 	makefile.mingw \
 	makefile.mingw.in \

app/paint/makefile.msc

@@ -51,7 +51,9 @@ DEFINES = \
 all : \
 	$(PRJ_TOP)\config.h \
 	$(PACKAGE).lib \
+!IFDEF DLLGIMP
 	$(PACKAGE)-$(PKG_VER).dll
+!ENDIF
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
 	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h

app/pdb/text_tool_cmds.c

@@ -111,7 +111,7 @@ text_fontname_invoker (Gimp     *gimp,
     success = FALSE;
 
   size_type = args[8].value.pdb_int;
-  if (size_type < PIXELS || size_type > POINTS)
+  if (size_type < SIZE_PIXELS || size_type > SIZE_POINTS)
     success = FALSE;
 
   fontname = (gchar *) args[9].value.pdb_pointer;
@@ -183,7 +183,7 @@ static ProcArg text_fontname_inargs[] =
   {
     GIMP_PDB_INT32,
     "size_type",
-    "The units of specified size: PIXELS (0) or POINTS (1)"
+    "The units of specified size: SIZE_PIXELS (0) or SIZE_POINTS (1)"
   },
   {
     GIMP_PDB_STRING,
@@ -242,7 +242,7 @@ text_get_extents_fontname_invoker (Gimp     *gimp,
     success = FALSE;
 
   size_type = args[2].value.pdb_int;
-  if (size_type < PIXELS || size_type > POINTS)
+  if (size_type < SIZE_PIXELS || size_type > SIZE_POINTS)
     success = FALSE;
 
   fontname = (gchar *) args[3].value.pdb_pointer;
@@ -288,7 +288,7 @@ static ProcArg text_get_extents_fontname_inargs[] =
   {
     GIMP_PDB_INT32,
     "size_type",
-    "The units of specified size: PIXELS (0) or POINTS (1)"
+    "The units of specified size: SIZE_PIXELS (0) or SIZE_POINTS (1)"
   },
   {
     GIMP_PDB_STRING,
@@ -450,7 +450,7 @@ static ProcArg text_inargs[] =
   {
     GIMP_PDB_INT32,
     "size_type",
-    "The units of specified size: PIXELS (0) or POINTS (1)"
+    "The units of specified size: SIZE_PIXELS (0) or SIZE_POINTS (1)"
   },
   {
     GIMP_PDB_STRING,
@@ -603,7 +603,7 @@ static ProcArg text_get_extents_inargs[] =
   {
     GIMP_PDB_INT32,
     "size_type",
-    "The units of specified size: PIXELS (0) or POINTS (1)"
+    "The units of specified size: SIZE_PIXELS (0) or SIZE_POINTS (1)"
   },
   {
     GIMP_PDB_STRING,

app/vectors/makefile.msc

@@ -31,7 +31,9 @@ OBJECTS = \
 all : \
 	$(PRJ_TOP)\config.h \
 	$(PACKAGE).lib \
+!IFDEF DLLGIMP
 	$(PACKAGE)-$(PKG_VER).dll
+!ENDIF
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
 	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h

app/widgets/gimphistogrambox.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpwidgets/gimpwidgets.h"

app/widgets/gimppropwidgets.c

@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpmath/gimpmath.h"

app/widgets/makefile.msc

@@ -30,6 +30,7 @@ OBJECTS = \
 	gimpbufferview.obj \
 	gimpchannellistitem.obj \
 	gimpchannellistview.obj \
+	gimpcoloreditor.obj \
 	gimpcolormapeditor.obj \
 	gimpcolorpanel.obj \
 	gimpcomponentlistitem.obj \
@@ -61,6 +62,7 @@ OBJECTS = \
 	gimpgradienteditor.obj \
 	gimpgradientpreview.obj \
 	gimphelp.obj \
+	gimphistogrambox.obj \
 	gimphistogramview.obj \
 	gimpimagedock.obj \
 	gimpimagefilepreview.obj \
@@ -79,6 +81,7 @@ OBJECTS = \
 	gimppatternpreview.obj \
 	gimppreview.obj \
 	gimppreview-utils.obj \
+	gimppropwidgets.obj \
 	gimpselectioneditor.obj \
 	gimptoolbox.obj \
 	gimptoolbox-color-area.obj \

libgimp/gimp.def

@@ -1,28 +1,4 @@
 EXPORTS
-	_gimp_channel_new
-	_gimp_drawable_thumbnail
-	_gimp_gradients_get_gradient_data
-	_gimp_image_get_cmap
-	_gimp_image_set_cmap
-	_gimp_image_thumbnail
-	_gimp_layer_copy
-	_gimp_layer_new
-	_gimp_procedural_db_get_data
-	_gimp_procedural_db_proc_info
-	_gimp_procedural_db_set_data
-	_gimp_selection_float
-	_gimp_unit_get_abbreviation
-	_gimp_unit_get_deletion_flag
-	_gimp_unit_get_digits
-	_gimp_unit_get_factor
-	_gimp_unit_get_identifier
-	_gimp_unit_get_number_of_built_in_units
-	_gimp_unit_get_number_of_units
-	_gimp_unit_get_plural
-	_gimp_unit_get_singular
-	_gimp_unit_get_symbol
-	_gimp_unit_new
-	_gimp_unit_set_deletion_flag
 	gimp_airbrush
 	gimp_airbrush_default
 	gimp_attach_new_parasite
@@ -42,6 +18,7 @@ EXPORTS
 	gimp_channel_get_tattoo
 	gimp_channel_get_visible
 	gimp_channel_new
+	gimp_channel_new
 	gimp_channel_set_color
 	gimp_channel_set_name
 	gimp_channel_set_opacity
@@ -122,6 +99,7 @@ EXPORTS
 	gimp_free_select
 	gimp_fuzzy_select
 	gimp_gamma
+	gimp_get_bg_guchar
 	gimp_get_default_comment
 	gimp_get_monitor_resolution
 	gimp_get_path_by_tattoo
@@ -131,6 +109,7 @@ EXPORTS
 	gimp_gradients_close_popup
 	gimp_gradients_get_gradient
 	gimp_gradients_get_gradient_data
+	gimp_gradients_get_gradient_data
 	gimp_gradients_get_list
 	gimp_gradients_sample_custom
 	gimp_gradients_sample_uniform
@@ -160,6 +139,7 @@ EXPORTS
 	gimp_image_get_channel_by_tattoo
 	gimp_image_get_channels
 	gimp_image_get_cmap
+	gimp_image_get_cmap
 	gimp_image_get_component_active
 	gimp_image_get_component_visible
 	gimp_image_get_filename
@@ -197,6 +177,7 @@ EXPORTS
 	gimp_image_set_active_channel
 	gimp_image_set_active_layer
 	gimp_image_set_cmap
+	gimp_image_set_cmap
 	gimp_image_set_component_active
 	gimp_image_set_component_visible
 	gimp_image_set_filename
@@ -216,6 +197,7 @@ EXPORTS
 	gimp_invert
 	gimp_layer_add_alpha
 	gimp_layer_copy
+	gimp_layer_copy
 	gimp_layer_create_mask
 	gimp_layer_delete
 	gimp_layer_get_apply_mask
@@ -231,6 +213,7 @@ EXPORTS
 	gimp_layer_is_floating_sel
 	gimp_layer_mask
 	gimp_layer_new
+	gimp_layer_new
 	gimp_layer_resize
 	gimp_layer_scale
 	gimp_layer_set_apply_mask
@@ -278,6 +261,11 @@ EXPORTS
 	gimp_patterns_set_popup
 	gimp_pencil
 	gimp_perspective
+	gimp_pixel_fetcher_destroy
+	gimp_pixel_fetcher_get_pixel
+	gimp_pixel_fetcher_get_pixel2
+	gimp_pixel_fetcher_new
+	gimp_pixel_fetcher_set_bg_color
 	gimp_pixel_rgn_get_col
 	gimp_pixel_rgn_get_pixel
 	gimp_pixel_rgn_get_rect
@@ -294,10 +282,13 @@ EXPORTS
 	gimp_plugin_domain_register
 	gimp_plugin_help_register
 	gimp_procedural_db_get_data
+	gimp_procedural_db_get_data
 	gimp_procedural_db_get_data_size
 	gimp_procedural_db_proc_info
+	gimp_procedural_db_proc_info
 	gimp_procedural_db_query
 	gimp_procedural_db_set_data
+	gimp_procedural_db_set_data
 	gimp_progress_init
 	gimp_progress_update
 	gimp_quit
@@ -305,6 +296,8 @@ EXPORTS
 	gimp_register_load_handler
 	gimp_register_magic_load_handler
 	gimp_register_save_handler
+	gimp_rgn_iterate1
+	gimp_rgn_iterate2
 	gimp_rotate
 	gimp_run_procedure
 	gimp_run_procedure2
@@ -313,6 +306,7 @@ EXPORTS
 	gimp_selection_bounds
 	gimp_selection_clear
 	gimp_selection_float
+	gimp_selection_float
 	gimp_selection_is_empty
 	gimp_selection_load
 	gimp_selection_none
@@ -338,7 +332,21 @@ EXPORTS
 	gimp_undo_push_group_end
 	gimp_undo_push_group_start
 	gimp_uninstall_temp_proc
+	gimp_unit_get_abbreviation
+	gimp_unit_get_deletion_flag
+	gimp_unit_get_digits
 	gimp_unit_get_factor
+	gimp_unit_get_factor
+	gimp_unit_get_identifier
+	gimp_unit_get_number_of_built_in_units
+	gimp_unit_get_number_of_units
+	gimp_unit_get_plural
+	gimp_unit_get_singular
+	gimp_unit_get_symbol
+	gimp_unit_new
+	gimp_unit_set_deletion_flag
 	gimp_version
 	set_gimp_PLUG_IN_INFO_PTR
 
+
+

libgimp/gimpmisc.c

@@ -24,7 +24,8 @@
  */
 
 #include <stdio.h>
-#include <sys/time.h> /* Used by gimp_timer_start/stop */
+
+#include <glib.h>
 
 #include "config.h"
 
@@ -246,31 +247,29 @@ gimp_get_bg_guchar (GimpDrawable *drawable,
     }
 }
 
-static struct timeval time_start;
+GTimer* _timer = NULL;
 
 void 
 gimp_timer_start(void)
 {
-  gettimeofday (&time_start, NULL);
+  g_return_if_fail (!_timer);
+
+  _timer = g_timer_new ();
 }
 
 void
 gimp_timer_stop(void)
 {
-  struct timeval time_stop;
-  long sec, usec;
+  double elapsed;
 
-  gettimeofday(&time_stop, NULL);
-  sec = time_stop.tv_sec  - time_start.tv_sec;
-  usec = time_stop.tv_usec - time_start.tv_usec;
-	
-  if (usec < 0)
-    {
-      sec--;
-      usec += 1000000;
-    }
-	
-  fprintf (stderr, "%ld.%ld seconds\n", sec, usec);
+  g_return_if_fail (_timer != NULL);
+
+  g_timer_stop (_timer);
+  elapsed = g_timer_elapsed (_timer, NULL);
+  g_timer_destroy (_timer);
+  _timer = NULL;
+
+  g_print ("%ld seconds\n", elapsed);
 }
 
 static void

libgimp/gimppixelfetcher.c

@@ -24,7 +24,8 @@
  */
 
 #include <stdio.h>
-#include <sys/time.h> /* Used by gimp_timer_start/stop */
+
+#include <glib.h>
 
 #include "config.h"
 
@@ -246,31 +247,29 @@ gimp_get_bg_guchar (GimpDrawable *drawable,
     }
 }
 
-static struct timeval time_start;
+GTimer* _timer = NULL;
 
 void 
 gimp_timer_start(void)
 {
-  gettimeofday (&time_start, NULL);
+  g_return_if_fail (!_timer);
+
+  _timer = g_timer_new ();
 }
 
 void
 gimp_timer_stop(void)
 {
-  struct timeval time_stop;
-  long sec, usec;
+  double elapsed;
 
-  gettimeofday(&time_stop, NULL);
-  sec = time_stop.tv_sec  - time_start.tv_sec;
-  usec = time_stop.tv_usec - time_start.tv_usec;
-	
-  if (usec < 0)
-    {
-      sec--;
-      usec += 1000000;
-    }
-	
-  fprintf (stderr, "%ld.%ld seconds\n", sec, usec);
+  g_return_if_fail (_timer != NULL);
+
+  g_timer_stop (_timer);
+  elapsed = g_timer_elapsed (_timer, NULL);
+  g_timer_destroy (_timer);
+  _timer = NULL;
+
+  g_print ("%ld seconds\n", elapsed);
 }
 
 static void

libgimp/gimpregioniterator.c

@@ -24,7 +24,8 @@
  */
 
 #include <stdio.h>
-#include <sys/time.h> /* Used by gimp_timer_start/stop */
+
+#include <glib.h>
 
 #include "config.h"
 
@@ -246,31 +247,29 @@ gimp_get_bg_guchar (GimpDrawable *drawable,
     }
 }
 
-static struct timeval time_start;
+GTimer* _timer = NULL;
 
 void 
 gimp_timer_start(void)
 {
-  gettimeofday (&time_start, NULL);
+  g_return_if_fail (!_timer);
+
+  _timer = g_timer_new ();
 }
 
 void
 gimp_timer_stop(void)
 {
-  struct timeval time_stop;
-  long sec, usec;
+  double elapsed;
 
-  gettimeofday(&time_stop, NULL);
-  sec = time_stop.tv_sec  - time_start.tv_sec;
-  usec = time_stop.tv_usec - time_start.tv_usec;
-	
-  if (usec < 0)
-    {
-      sec--;
-      usec += 1000000;
-    }
-	
-  fprintf (stderr, "%ld.%ld seconds\n", sec, usec);
+  g_return_if_fail (_timer != NULL);
+
+  g_timer_stop (_timer);
+  elapsed = g_timer_elapsed (_timer, NULL);
+  g_timer_destroy (_timer);
+  _timer = NULL;
+
+  g_print ("%ld seconds\n", elapsed);
 }
 
 static void

libgimp/makefile.msc

@@ -97,6 +97,7 @@ gimp_OBJECTS = \
 	gimphelp.obj \
 	gimpimage.obj \
 	gimplayer.obj \
+	gimpmisc.obj \
 	gimppixelrgn.obj \
 	gimpproceduraldb.obj \
 	gimpselection.obj \

libgimpbase/gimpbase.def

@@ -1,6 +1,8 @@
 EXPORTS
 	_gp_params_destroy
 	gimp_data_directory
+	gimp_datafiles_check_extension
+	gimp_datafiles_read_directories
 	gimp_directory
 	gimp_locale_directory
 	gimp_gtkrc

libgimpbase/gimpdatafiles.c

@@ -187,7 +187,7 @@ gimp_datafiles_read_directories (const gchar            *path_str,
 		    {
 		      (* loader_func) (&file_data);
 		    }
-#ifdef G_OS_WIN32
+#ifndef G_OS_WIN32
 		  else if ((flags & G_FILE_TEST_IS_SYMLINK) &&
                            S_ISLINK (filestat.st_mode))
 		    {

libgimpbase/makefile.msc

@@ -29,6 +29,7 @@ PKG_LINK = \
 
 OBJECTS = \
 	gimpenv.obj \
+	gimpdatafiles.obj \
 	gimpsignal.obj \
 	gimpparasite.obj \
 	gimpparasiteio.obj \

libgimpconfig/gimpconfig-iface.c

@@ -261,6 +261,12 @@ gimp_config_serialize (GObject      *object,
 
   close (fd);
 
+#ifdef G_OS_WIN32
+  /* win32 rename can't overwrite */
+  if (success)
+    unlink (filename);
+#endif
+
   if (success && rename (tmpname, filename) == -1)
     {
       g_set_error (error, 

libgimpmodule/gimpmodule.def

@@ -1,4 +1,10 @@
 EXPORTS
+	gimp_module_db_get_load_inhibit
+	gimp_module_db_get_type
+	gimp_module_db_load
+	gimp_module_db_new
+	gimp_module_db_refresh
+	gimp_module_db_set_load_inhibit
 	gimp_module_get_type
 	gimp_module_new
 	gimp_module_modified
@@ -6,3 +12,5 @@ EXPORTS
 	gimp_module_info_new
 	gimp_module_info_copy
 	gimp_module_info_free
+	gimp_module_query_module
+	gimp_module_state_name

libgimpmodule/makefile.msc

@@ -25,10 +25,12 @@ INCLUDES = \
 	-I$(includedir) \
 
 PKG_LINK = \
-	$(GLIB_LIBS)
+	$(GLIB_LIBS) $(INTL_LIBS) \
+	..\libgimpbase\gimpbase-$(PKG_VER).lib
 
 OBJECTS = \
-	gimpmodule.obj
+	gimpmodule.obj \
+	gimpmoduledb.obj \
 
 lib_LTLIBRARIES = \
 	libgimpmodule-1.3.la

libgimptool/makefile.msc

@@ -23,8 +23,9 @@ OBJECTS = \
 all : \
 	$(PRJ_TOP)\config.h \
 	$(PACKAGE).lib \
+!IFDEF DLLGIMP
 	$(PACKAGE)-$(PKG_VER).dll
-
+!ENDIF
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
 	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h

libgimpwidgets/gimppropwidgets.c

@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpmath/gimpmath.h"

libgimpwidgets/gimpwidgets.def

@@ -18,6 +18,33 @@ EXPORTS
 	gimp_color_button_new
 	gimp_color_button_set_color
 	gimp_color_button_set_type
+	gimp_color_display_changed
+	gimp_color_display_clone
+	gimp_color_display_configure
+	gimp_color_display_configure_reset
+	gimp_color_display_convert
+	gimp_color_display_get_type
+	gimp_color_display_load_state
+	gimp_color_display_new
+	gimp_color_display_save_state
+	gimp_color_notebook_get_type
+	gimp_color_notebook_set_has_page
+	gimp_color_scale_entry_new
+	gimp_color_scale_get_type
+	gimp_color_scale_new
+	gimp_color_scale_set_channel
+	gimp_color_scale_set_color
+	gimp_color_scales_get_type
+	gimp_color_select_get_type
+	gimp_color_selector_channel_changed
+	gimp_color_selector_color_changed
+	gimp_color_selector_get_type
+	gimp_color_selector_new
+	gimp_color_selector_set_channel
+	gimp_color_selector_set_color
+	gimp_color_selector_set_show_alpha
+	gimp_color_selector_set_toggles_sensitive
+	gimp_color_selector_set_toggles_visible
 	gimp_context_help
 	gimp_coordinates_new
 	gimp_dialog_create_action_area
@@ -25,7 +52,6 @@ EXPORTS
 	gimp_dialog_get_type
 	gimp_dialog_new
 	gimp_dialog_newv
-;	gimp_dialog_set_icon
 	gimp_double_adjustment_update
 	gimp_file_selection_get_filename
 	gimp_file_selection_get_type
@@ -39,7 +65,7 @@ EXPORTS
 	gimp_help_init
 	gimp_help_set_help_data
 	gimp_int_adjustment_update
-	gimp_mem_size_entry_new
+	gimp_memsize_entry_new
 	gimp_menu_item_update
 	gimp_offset_area_get_type
 	gimp_offset_area_new
@@ -54,6 +80,9 @@ EXPORTS
 	gimp_path_editor_get_path
 	gimp_path_editor_get_type
 	gimp_path_editor_new
+	gimp_path_editor_set_path
+	gimp_pick_button_get_type
+	gimp_pick_button_new
 	gimp_pixmap_button_new
 	gimp_pixmap_get_type
 	gimp_pixmap_new
@@ -69,6 +98,8 @@ EXPORTS
 	gimp_radio_group_set_active
 	gimp_random_seed_new
 	gimp_scale_entry_new
+	gimp_scale_entry_new_internal
+	gimp_scale_entry_set_sensitive
 	gimp_size_entry_add_field
 	gimp_size_entry_attach_label
 	gimp_size_entry_get_refval
@@ -106,4 +137,3 @@ EXPORTS
 	gimp_unit_menu_set_unit
 	gimp_unit_menu_update
 	gimp_widgets_init
-

libgimpwidgets/makefile.msc

@@ -23,11 +23,11 @@ INCLUDES = -I..
 DEPCFLAGS = \
 	-FImsvc_recommended_pragmas.h \
 	$(GLIB_CFLAGS) $(GTK2_CFLAGS) $(INTL_CFLAGS)
-DEPLIBS = $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \
-		$(GTK2)\gdk-pixbuf\gdk_pixbuf-$(GTK_VER).lib 
+DEPLIBS = $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS)
 
 all : \
 	..\config.h \
+	gimpwidgetsmarshal.c \
 	gimpwidgets-$(GIMP_VER).dll
 
 ..\config.h : ..\config.h.win32
@@ -41,11 +41,18 @@ OBJECTS = \
 	gimpchainbutton.obj \
 	gimpcolorarea.obj \
 	gimpcolorbutton.obj \
+	gimpcolordisplay.obj \
+	gimpcolornotebook.obj \
+	gimpcolorscale.obj \
+	gimpcolorscales.obj \
+	gimpcolorselect.obj \
+	gimpcolorselector.obj \
 	gimpdialog.obj \
 	gimpfileselection.obj \
 	gimphelpui.obj \
 	gimpoffsetarea.obj \
 	gimppatheditor.obj \
+	gimppickbutton.obj \
 	gimppixmap.obj \
 	gimpquerybox.obj \
 	gimpsizeentry.obj \

plug-ins/common/iwarp.c

@@ -743,7 +743,8 @@ iwarp (void)
       for (i = 0; i < animate_num_frames; i++)
 	{
 	  st = g_strdup_printf (_("Frame %d"), i);
-	  animlayers[i] = _gimp_layer_copy (layerID, TRUE);
+	  animlayers[i] = gimp_layer_copy (layerID);
+	  gimp_layer_add_alpha (animlayers[i]);
 	  gimp_layer_set_name (animlayers[i], st);
 	  g_free (st);
 	  destdrawable = gimp_drawable_get (animlayers[i]);
@@ -764,8 +765,8 @@ iwarp (void)
 	  for (i = 0; i < animate_num_frames; i++)
 	    {
 	      gimp_progress_update ((gdouble) i / (animate_num_frames - 1));
-	      layerID = _gimp_layer_copy (animlayers[animate_num_frames-i-1],
-					  TRUE); 
+	      layerID = gimp_layer_copy (animlayers[animate_num_frames-i-1]); 
+	      gimp_layer_add_alpha (layerID);
 	      st = g_strdup_printf (_("Frame %d"), i + animate_num_frames);
 	      gimp_layer_set_name (layerID, st);
 	      g_free (st);

plug-ins/common/randomize.c

@@ -137,8 +137,7 @@ static RandomizeVals pivals =
 {
   50.0,
   1.0,
-  SEED_DEFAULT,
-  0,
+  SEED_DEFAULT
 };
 
 typedef struct

plug-ins/common/sinus.c

@@ -1052,8 +1052,7 @@ static SinusVals svals =
   LINEAR, 
   USE_COLORS,
   { 1.0, 1.0, 0.0, 1.0 },
-  { 0.0, 0.0, 1.0, 1.0 },
-  TRUE
+  { 0.0, 0.0, 1.0, 1.0 }
 };
 
 typedef struct

plug-ins/common/warp.c

@@ -67,8 +67,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
 
 #include <gtk/gtk.h>
 

plug-ins/makefile.msc

@@ -31,12 +31,12 @@ FROMPLUGINSDIR=YES		# Used to bypass other parts below
 # List plug-ins. We must use several lists to work around nmake's limits
 
 # The COMMON* ones are in the common subdirectory
-COMMON1 = AlienMap AlienMap2 CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard colorify compose convmatrix csource cubism curve_bend
+COMMON1 = AlienMap AlienMap2 CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard color_enhance colorify colortoalpha compose convmatrix csource cubism curve_bend
 COMMON2 = decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange film flarefx fractaltrace
 COMMON3 = gauss_iir gauss_rle gbr gee gicon gif gifload glasstile gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic
-COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd randomize ripple rotate
-COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift sinus smooth_palette snoise sobel sparkle spheredesigner spread struc sunras tga threshold_alpha tiff tile tileit tiler unsharp video vinvert vpropagate 
-COMMON6 = waves whirlpinch winclipboard wind winprint wmf xbm xwd zealouscrop
+COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd psp randomize ripple rotate
+COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift sinus smooth_palette snoise sobel sparkle spheredesigner spread struc sunras tga threshold_alpha tiff tile tileit tiler uniteditor unsharp video vinvert vpropagate 
+COMMON6 = warp waves whirlpinch winclipboard wind winprint wiredebug wmf xbm xwd zealouscrop
 
 # not any longer supported ?
 DROPPED = gpb gdyntext 

regexrepl/makefile.msc

@@ -5,7 +5,7 @@ TOP = ..\..
 PRJ_TOP = ..
 PACKAGE = regexrepl
 PKG_VER = 1.3
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE $(TOP)\glib\build\win32\make.msc
 
 top_srcdir = $(PRJ_TOP)
 top_builddir = $(PRJ_TOP)
@@ -22,7 +22,7 @@ regex.obj : regex.c regex.h
 
 all : \
 	$(PRJ_TOP)\config.h \
-	$(PACKAGE).lib
+	$(PACKAGE).dll
 
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
@@ -33,8 +33,8 @@ RESOURCE = $(PACKAGE).res
 $(PACKAGE).lib : $(OBJECTS)
 	lib /out:$(PACKAGE).lib $(OBJECTS)
 
-$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
-	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
+$(PACKAGE).dll : $(OBJECTS) $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
 
 $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
 	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \

regexrepl/regexrepl.def

@@ -0,0 +1,15 @@
+EXPORTS
+;	re_comp
+	re_compile_fastmap
+	re_compile_pattern
+;	re_exec
+	re_match
+	re_match_2
+	re_search
+	re_search_2
+	re_set_registers
+	re_set_syntax
+	regcomp
+	regerror
+	regexec
+	regfree

themes/Default/images/makefile.msc

@@ -0,0 +1,211 @@
+# TOP = ..\..\..
+# !INCLUDE $(TOP)\glib\build\win32\make.msc
+
+STOCK_VARIABLES = \
+	gimp_dialog_error		gimp-dialog-error.png	\
+	gimp_dialog_info		gimp-dialog-info.png	\
+	gimp_dialog_question		gimp-dialog-question.png	\
+	gimp_dialog_warning		gimp-dialog-warning.png	\
+	stock_all_16		stock-all-16.png \
+	stock_anchor_16		stock-anchor-16.png	\
+	stock_button_anchor		stock-button-anchor.png	\
+	stock_button_delete		stock-button-delete.png	\
+	stock_button_duplicate		stock-button-duplicate.png	\
+	stock_button_edit		stock-button-edit.png	\
+	stock_button_eye		stock-button-eye.png	\
+	stock_button_hchain_broken		stock-button-hchain-broken.png	\
+	stock_button_hchain		stock-button-hchain.png	\
+	stock_button_linked		stock-button-linked.png	\
+	stock_button_lower		stock-button-lower.png	\
+	stock_button_new		stock-button-new.png	\
+	stock_button_paste_as_new		stock-button-paste-as-new.png	\
+	stock_button_paste_into		stock-button-paste-into.png	\
+	stock_button_paste		stock-button-paste.png	\
+	stock_button_path_stroke		stock-button-path-stroke.png	\
+	stock_button_raise		stock-button-raise.png	\
+	stock_button_refresh		stock-button-refresh.png	\
+	stock_button_reset		stock-button-reset.png	\
+	stock_button_selection_add		stock-button-selection-add.png	\
+	stock_button_selection_intersect		stock-button-selection-intersect.png	\
+	stock_button_selection_replace		stock-button-selection-replace.png	\
+	stock_button_selection_stroke		stock-button-selection-stroke.png	\
+	stock_button_selection_subtract		stock-button-selection-subtract.png	\
+	stock_button_selection_to_path		stock-button-selection-to-path.png	\
+	stock_button_stroke		stock-button-stroke.png	\
+	stock_button_to_path		stock-button-to-path.png	\
+	stock_button_to_selection		stock-button-to-selection.png	\
+	stock_button_vchain_broken		stock-button-vchain-broken.png	\
+	stock_button_vchain		stock-button-vchain.png	\
+	stock_char_picker_22	stock-char-picker-22.png		\
+	stock_color_picker_black_18	stock-color-picker-black-18.png		\
+	stock_color_picker_gray_18	stock-color-picker-gray-18.png		\
+	stock_color_picker_white_18	stock-color-picker-white-18.png		\
+	stock_color_triangle_16	stock-color-triangle-16.png		\
+	stock_convert_grayscale_16		stock-convert-grayscale-16.png	\
+	stock_convert_indexed_16		stock-convert-indexed-16.png	\
+	stock_convert_rgb_16		stock-convert-rgb-16.png	\
+	stock_default_colors_12		stock-default-colors-12.png	\
+	stock_delete_16		stock-delete-16.png	\
+	stock_duplicate_16		stock-duplicate-16.png	\
+	stock_edit_16		stock-edit-16.png	\
+	stock_error_64		stock-error-64.png	\
+	stock_eye_20		stock-eye-20.png	\
+	stock_grow_16		stock-grow-16.png \
+	stock_hchain_24		stock-hchain-24.png	\
+	stock_hchain_broken_24		stock-hchain-broken-24.png	\
+	stock_info_16		stock-info-16.png	\
+	stock_info_24		stock-info-24.png	\
+	stock_info_64		stock-info-64.png	\
+	stock_invert_16		stock-invert-16.png	\
+	stock_layer_to_imagesize_16		stock-layer-to-imagesize-16.png	\
+	stock_letter_spacing_22		stock-letter-spacing-22.png	\
+	stock_line_spacing_22	stock-line-spacing-22.png	\
+	stock_linked_20		stock-linked-20.png	\
+	stock_lower_16		stock-lower-16.png	\
+	stock_menu_convert_grayscale		stock-menu-convert-grayscale.png	\
+	stock_menu_convert_indexed		stock-menu-convert-indexed.png	\
+	stock_menu_convert_rgb		stock-menu-convert-rgb.png	\
+	stock_menu_merge_down		stock-menu-merge-down.png	\
+	stock_menu_navigation		stock-menu-navigation.png	\
+	stock_menu_qmask_off		stock-menu-qmask-off.png	\
+	stock_menu_qmask_on		stock-menu-qmask-on.png	\
+	stock_menu_reshow_filter		stock-menu-reshow-filter.png	\
+	stock_menu_resize		stock-menu-resize.png	\
+	stock_menu_rotate_180		stock-menu-rotate-180.png	\
+	stock_menu_rotate_270		stock-menu-rotate-270.png	\
+	stock_menu_rotate_90		stock-menu-rotate-90.png	\
+	stock_menu_scale		stock-menu-scale.png	\
+	stock_menu_selection_to_channel		stock-menu-selection-to-channel.png	\
+	stock_merge_down_16		stock-merge-down-16.png	\
+	stock_navigation_16		stock-navigation-16.png	\
+	stock_new_16		stock-new-16.png	\
+	stock_none_16		stock-none-16.png \
+	stock_paste_16		stock-paste-16.png	\
+	stock_paste_as_new_16		stock-paste-as-new-16.png	\
+	stock_paste_into_16		stock-paste-into-16.png	\
+	stock_path_stroke_16		stock-path-stroke-16.png	\
+	stock_plugin_16		stock-plugin-16.png	\
+	stock_qmask_off_16		stock-qmask-off-16.png	\
+	stock_qmask_on_16		stock-qmask-on-16.png	\
+	stock_question_64		stock-question-64.png	\
+	stock_raise_16		stock-raise-16.png	\
+	stock_refresh_16		stock-refresh-16.png	\
+	stock_reset_16		stock-reset-16.png	\
+	stock_reshow_filter_16		stock-reshow-filter-16.png	\
+	stock_resize_16		stock-resize-16.png	\
+	stock_rotate_180_16		stock-rotate-180-16.png	\
+	stock_rotate_270_16		stock-rotate-270-16.png	\
+	stock_rotate_90_16		stock-rotate-90-16.png	\
+	stock_scale_16		stock-scale-16.png	\
+	stock_selection_add_16		stock-selection-add-16.png	\
+	stock_selection_intersect_16		stock-selection-intersect-16.png	\
+	stock_selection_replace_16		stock-selection-replace-16.png	\
+	stock_selection_stroke_16		stock-selection-stroke-16.png	\
+	stock_selection_subtract_16		stock-selection-subtract-16.png	\
+	stock_selection_to_channel_16		stock-selection-to-channel-16.png	\
+	stock_selection_to_path_16		stock-selection-to-path-16.png	\
+	stock_shrink_16		stock-shrink-16.png \
+	stock_swap_colors_12		stock-swap-colors-12.png	\
+	stock_tool_options_16		stock-tool-options-16.png	\
+	stock_vchain_24		stock-vchain-24.png	\
+	stock_vchain_broken_24		stock-vchain-broken-24.png	\
+	stock_warning_16		stock-warning-16.png	\
+	stock_warning_24		stock-warning-24.png	\
+	stock_warning_64		stock-warning-64.png	\
+	stock_wilber_eek_64		stock-wilber-eek-64.png	\
+	stock_wilber_16		stock-wilber-16.png	\
+
+STOCK_TOOL_VARIABLES = \
+	stock_tool_airbrush_22		tools/stock-tool-airbrush-22.png	\
+	stock_tool_bezier_select_22		tools/stock-tool-bezier-select-22.png	\
+	stock_tool_blend_22		tools/stock-tool-blend-22.png	\
+	stock_tool_blur_22		tools/stock-tool-blur-22.png	\
+	stock_tool_brightness_contrast_22		tools/stock-tool-brightness-contrast-22.png	\
+	stock_tool_bucket_fill_22		tools/stock-tool-bucket-fill-22.png	\
+	stock_tool_button_airbrush		tools/stock-tool-button-airbrush.png	\
+	stock_tool_button_bezier_select		tools/stock-tool-button-bezier-select.png	\
+	stock_tool_button_blend		tools/stock-tool-button-blend.png	\
+	stock_tool_button_blur		tools/stock-tool-button-blur.png	\
+	stock_tool_button_brightness_contrast		tools/stock-tool-button-brightness-contrast.png	\
+	stock_tool_button_bucket_fill		tools/stock-tool-button-bucket-fill.png	\
+	stock_tool_button_by_color_select		tools/stock-tool-button-by-color-select.png	\
+	stock_tool_button_clone		tools/stock-tool-button-clone.png	\
+	stock_tool_button_color_balance		tools/stock-tool-button-color-balance.png	\
+	stock_tool_button_color_picker		tools/stock-tool-button-color-picker.png	\
+	stock_tool_button_crop		tools/stock-tool-button-crop.png	\
+	stock_tool_button_curves		tools/stock-tool-button-curves.png	\
+	stock_tool_button_dodge		tools/stock-tool-button-dodge.png	\
+	stock_tool_button_ellipse_select		tools/stock-tool-button-ellipse-select.png	\
+	stock_tool_button_eraser		tools/stock-tool-button-eraser.png	\
+	stock_tool_button_flip		tools/stock-tool-button-flip.png	\
+	stock_tool_button_free_select		tools/stock-tool-button-free-select.png	\
+	stock_tool_button_fuzzy_select		tools/stock-tool-button-fuzzy-select.png	\
+	stock_tool_button_histogram		tools/stock-tool-button-histogram.png	\
+	stock_tool_button_hue_saturation		tools/stock-tool-button-hue-saturation.png	\
+	stock_tool_button_ink		tools/stock-tool-button-ink.png	\
+	stock_tool_button_iscissors		tools/stock-tool-button-iscissors.png	\
+	stock_tool_button_levels		tools/stock-tool-button-levels.png	\
+	stock_tool_button_measure		tools/stock-tool-button-measure.png	\
+	stock_tool_button_move		tools/stock-tool-button-move.png	\
+	stock_tool_button_paintbrush		tools/stock-tool-button-paintbrush.png	\
+	stock_tool_button_path		tools/stock-tool-button-path.png	\
+	stock_tool_button_pencil		tools/stock-tool-button-pencil.png	\
+	stock_tool_button_perspective		tools/stock-tool-button-perspective.png	\
+	stock_tool_button_posterize		tools/stock-tool-button-posterize.png	\
+	stock_tool_button_rect_select		tools/stock-tool-button-rect-select.png	\
+	stock_tool_button_rotate		tools/stock-tool-button-rotate.png	\
+	stock_tool_button_scale		tools/stock-tool-button-scale.png	\
+	stock_tool_button_shear		tools/stock-tool-button-shear.png	\
+	stock_tool_button_smudge		tools/stock-tool-button-smudge.png	\
+	stock_tool_button_text		tools/stock-tool-button-text.png	\
+	stock_tool_button_threshold		tools/stock-tool-button-threshold.png	\
+	stock_tool_button_zoom		tools/stock-tool-button-zoom.png	\
+	stock_tool_by_color_select_22		tools/stock-tool-by-color-select-22.png	\
+	stock_tool_clone_22		tools/stock-tool-clone-22.png	\
+	stock_tool_color_balance_22		tools/stock-tool-color-balance-22.png	\
+	stock_tool_color_picker_22		tools/stock-tool-color-picker-22.png	\
+	stock_tool_crop_22		tools/stock-tool-crop-22.png	\
+	stock_tool_curves_22		tools/stock-tool-curves-22.png	\
+	stock_tool_dodge_22		tools/stock-tool-dodge-22.png	\
+	stock_tool_ellipse_select_22		tools/stock-tool-ellipse-select-22.png	\
+	stock_tool_eraser_22		tools/stock-tool-eraser-22.png	\
+	stock_tool_flip_22		tools/stock-tool-flip-22.png	\
+	stock_tool_free_select_22		tools/stock-tool-free-select-22.png	\
+	stock_tool_fuzzy_select_22		tools/stock-tool-fuzzy-select-22.png	\
+	stock_tool_histogram_22		tools/stock-tool-histogram-22.png	\
+	stock_tool_hue_saturation_22		tools/stock-tool-hue-saturation-22.png	\
+	stock_tool_ink_22		tools/stock-tool-ink-22.png	\
+	stock_tool_iscissors_22		tools/stock-tool-iscissors-22.png	\
+	stock_tool_levels_22		tools/stock-tool-levels-22.png	\
+	stock_tool_measure_22		tools/stock-tool-measure-22.png	\
+	stock_tool_move_22		tools/stock-tool-move-22.png	\
+	stock_tool_paintbrush_22		tools/stock-tool-paintbrush-22.png	\
+	stock_tool_path_22		tools/stock-tool-path-22.png	\
+	stock_tool_pencil_22		tools/stock-tool-pencil-22.png	\
+	stock_tool_perspective_22		tools/stock-tool-perspective-22.png	\
+	stock_tool_posterize_22		tools/stock-tool-posterize-22.png	\
+	stock_tool_rect_select_22		tools/stock-tool-rect-select-22.png	\
+	stock_tool_rotate_22		tools/stock-tool-rotate-22.png	\
+	stock_tool_scale_22		tools/stock-tool-scale-22.png	\
+	stock_tool_shear_22		tools/stock-tool-shear-22.png	\
+	stock_tool_smudge_22		tools/stock-tool-smudge-22.png	\
+	stock_tool_text_22		tools/stock-tool-text-22.png	\
+	stock_tool_threshold_22		tools/stock-tool-threshold-22.png	\
+	stock_tool_zoom_22		tools/stock-tool-zoom-22.png	\
+
+WILBER_VARIABLES = \
+	stock_wilber_16		stock-wilber-16.png	\
+	stock_wilber_32		stock-wilber-32.png	\
+	stock_wilber_48		stock-wilber-48.png	\
+	stock_wilber_64		stock-wilber-64.png	\
+
+all: \
+	gimp-stock-pixbufs.h \
+	gimp-wilber-pixbufs.h
+
+
+gimp-stock-pixbufs.h: $(STOCK_IMAGES) makefile.msc
+	gdk-pixbuf-csource --raw --build-list $(STOCK_VARIABLES) $(STOCK_TOOL_VARIABLES) > gimp-stock-pixbufs.h
+
+gimp-wilber-pixbufs.h: $(WILBER_IMAGES) makefile.msc
+	gdk-pixbuf-csource --raw --build-list $(WILBER_VARIABLES) > gimp-wilber-pixbufs.h

themes/Default/makefile.msc

@@ -1,89 +0,0 @@
-# TOP = ..\..\..
-# !INCLUDE $(TOP)\glib\build\win32\make.msc
-
-STOCK_VARIABLES = \
-	stock_button_anchor	images/stock-button-anchor.png	\
-	stock_button_delete	images/stock-button-delete.png	\
-	stock_button_duplicate	images/stock-button-duplicate.png	\
-	stock_button_edit	images/stock-button-edit.png		\
-	stock_button_eye	images/stock-button-eye.png		\
-	stock_button_linked	images/stock-button-linked.png	\
-	stock_button_lower	images/stock-button-lower.png		\
-	stock_button_new	images/stock-button-new.png		\
-	stock_button_paste	images/stock-button-paste.png		\
-	stock_button_paste_as_new	images/stock-button-paste-as-new.png	\
-	stock_button_paste_into	images/stock-button-paste-into.png	\
-	stock_button_raise	images/stock-button-raise.png		\
-	stock_button_refresh	images/stock-button-refresh.png	\
-	stock_button_stroke	images/stock-button-stroke.png	\
-	stock_button_to_path	images/stock-button-to-path.png	\
-	stock_button_to_selection	images/stock-button-to-selection.png	\
-	stock_button_selection_replace	images/stock-button-selection-replace.png	\
-	stock_button_selection_add	images/stock-button-selection-add.png		\
-	stock_button_selection_subtract	images/stock-button-selection-subtract.png	\
-	stock_button_selection_intersect	images/stock-button-selection-intersect.png	\
-	stock_button_hchain	images/stock-button-hchain.png		\
-	stock_button_hchain_broken	images/stock-button-hchain-broken.png		\
-	stock_button_vchain	images/stock-button-vchain.png		\
-	stock_button_vchain_broken	images/stock-button-vchain-broken.png		\
-	stock_menu_navigation	images/stock-menu-navigation.png		\
-	stock_menu_qmask_off	images/stock-menu-qmask-off.png		\
-	stock_menu_qmask_on	images/stock-menu-qmask-on.png		\
-	stock_wilber_eek	images/stock-wilber-eek.png			\
-
-STOCK_TOOL_VARIABLES = \
-	stock_tool_button_airbrush	images/tools/stock-tool-button-airbrush.png			\
-	stock_tool_button_bezier_select	images/tools/stock-tool-button-bezier-select.png		\
-	stock_tool_button_blend		images/tools/stock-tool-button-blend.png			\
-	stock_tool_button_blur	images/tools/stock-tool-button-blur.png			\
-	stock_tool_button_brightness_contrast	images/tools/stock-tool-button-brightness-contrast.png	\
-	stock_tool_button_bucket_fill	images/tools/stock-tool-button-bucket-fill.png		\
-	stock_tool_button_by_color_select	images/tools/stock-tool-button-by-color-select.png		\
-	stock_tool_button_clone	images/tools/stock-tool-button-clone.png			\
-	stock_tool_button_color_balance	images/tools/stock-tool-button-color-balance.png		\
-	stock_tool_button_color_picker	images/tools/stock-tool-button-color-picker.png		\
-	stock_tool_button_crop	images/tools/stock-tool-button-crop.png			\
-	stock_tool_button_curves	images/tools/stock-tool-button-curves.png			\
-	stock_tool_button_dodge	images/tools/stock-tool-button-dodge.png			\
-	stock_tool_button_ellipse_select	images/tools/stock-tool-button-ellipse-select.png		\
-	stock_tool_button_eraser	images/tools/stock-tool-button-eraser.png			\
-	stock_tool_button_flip	images/tools/stock-tool-button-flip.png			\
-	stock_tool_button_free_select	images/tools/stock-tool-button-free-select.png		\
-	stock_tool_button_fuzzy_select	images/tools/stock-tool-button-fuzzy-select.png		\
-	stock_tool_button_histogram	images/tools/stock-tool-button-histogram.png			\
-	stock_tool_button_hue_saturation	images/tools/stock-tool-button-hue-saturation.png		\
-	stock_tool_button_ink	images/tools/stock-tool-button-ink.png			\
-	stock_tool_button_iscissors	images/tools/stock-tool-button-iscissors.png			\
-	stock_tool_button_levels	images/tools/stock-tool-button-levels.png			\
-	stock_tool_button_measure	images/tools/stock-tool-button-measure.png			\
-	stock_tool_button_move	images/tools/stock-tool-button-move.png			\
-	stock_tool_button_paintbrush	images/tools/stock-tool-button-paintbrush.png			\
-	stock_tool_button_path	images/tools/stock-tool-button-path.png			\
-	stock_tool_button_pencil	images/tools/stock-tool-button-pencil.png			\
-	stock_tool_button_perspective	images/tools/stock-tool-button-perspective.png		\
-	stock_tool_button_posterize	images/tools/stock-tool-button-posterize.png			\
-	stock_tool_button_rect_select	images/tools/stock-tool-button-rect-select.png		\
-	stock_tool_button_rotate	images/tools/stock-tool-button-rotate.png			\
-	stock_tool_button_scale	images/tools/stock-tool-button-scale.png			\
-	stock_tool_button_shear	images/tools/stock-tool-button-shear.png			\
-	stock_tool_button_smudge	images/tools/stock-tool-button-smudge.png			\
-	stock_tool_button_text	images/tools/stock-tool-button-text.png			\
-	stock_tool_button_threshold	images/tools/stock-tool-button-threshold.png			\
-	stock_tool_button_zoom	images/tools/stock-tool-button-zoom.png			\
-
-WILBER_VARIABLES = \
-	stock_wilber_16_16	images/stock-wilber-16x16.png		\
-	stock_wilber_32_32	images/stock-wilber-32x32.png		\
-	stock_wilber_48_48	images/stock-wilber-48x48.png		\
-	stock_wilber_64_64	images/stock-wilber-64x64.png		\
-
-all: \
-	gimp-stock-pixbufs.h \
-	gimp-wilber-pixbufs.h
-
-
-gimp-stock-pixbufs.h: $(STOCK_IMAGES) makefile.msc
-	gdk-pixbuf-csource --raw --build-list $(STOCK_VARIABLES) $(STOCK_TOOL_VARIABLES) > gimp-stock-pixbufs.h
-
-gimp-wilber-pixbufs.h: $(WILBER_IMAGES) makefile.msc
-	gdk-pixbuf-csource --raw --build-list $(WILBER_VARIABLES) > gimp-wilber-pixbufs.h

tools/pdbgen/enums.pl

@@ -362,9 +362,9 @@ package Gimp::CodeGen::enums;
     SizeType =>
 	{ contig => 1,
 	  header => 'core/core-types.h',
-	  symbols => [ qw(PIXELS POINTS) ],
-	  mapping => { PIXELS => '0',
-		       POINTS => '1' }
+	  symbols => [ qw(SIZE_PIXELS SIZE_POINTS) ],
+	  mapping => { SIZE_PIXELS => '0',
+		       SIZE_POINTS => '1' }
 	},
     GimpCloneType =>
 	{ contig => 1,