[new file] app/dialogs/Makefile.am : added to EXTRA_DIST

2004-09-21  Hans Breuer  <hans@breuer.org>

	* app/dialogs/makefile.msc : [new file]
	  app/dialogs/Makefile.am : added to EXTRA_DIST

	* **/makefile.msc app/gimpcore.def : updated

	* app/gimp.rc : let wilber be first

	* app/widgets/gimppropwidgets.c : msvc6 can't cast uint64 either

	* libgimpbase/gimpwin32-io.h : make up recent loss of ftruncate in GLib

	* libgimpthumbnail/gimpthumbnail.c : <process.h> for getpid() on win32

	* plug-ins/helpbrowser/dialog.c : include gimpwin32-io.h

	* plug-ins/script-fu/siodwrapper.c plug-ins/script-fu/scrip-fu.c : there
	is no script-fu-server on win32

ChangeLog

@@ -1,3 +1,23 @@
+2004-09-21  Hans Breuer  <hans@breuer.org>
+
+	* app/dialogs/makefile.msc : [new file]
+	  app/dialogs/Makefile.am : added to EXTRA_DIST
+
+	* **/makefile.msc app/gimpcore.def : updated
+
+	* app/gimp.rc : let wilber be first
+
+	* app/widgets/gimppropwidgets.c : msvc6 can't cast uint64 either
+
+	* libgimpbase/gimpwin32-io.h : make up recent loss of ftruncate in GLib
+
+	* libgimpthumbnail/gimpthumbnail.c : <process.h> for getpid() on win32
+
+	* plug-ins/helpbrowser/dialog.c : include gimpwin32-io.h
+
+	* plug-ins/script-fu/siodwrapper.c plug-ins/script-fu/scrip-fu.c : there
+	is no script-fu-server on win32
+
 2004-11-21  Michael Schumacher <schumaml@cvs.gnome.org>
 
 	* plug-ins/script-fu/scripts/addborder.scm: first resize the

app/actions/makefile.msc

@@ -78,6 +78,8 @@ OBJECTS = \
 	select-commands.obj \
 	templates-actions.obj \
 	templates-commands.obj \
+	text-editor-actions.obj \
+	text-editor-commands.obj \
 	tool-options-actions.obj \
 	tool-options-commands.obj \
 	tools-actions.obj \

app/core/makefile.msc

@@ -62,6 +62,7 @@ OBJECTS = \
 	gimpdrawable-equalize.obj \
 	gimpdrawable-histogram.obj \
 	gimpdrawable-invert.obj \
+	gimpdrawable-levels.obj \
 	gimpdrawable-offset.obj \
 	gimpdrawable-preview.obj \
 	gimpdrawable-stroke.obj \
@@ -115,9 +116,12 @@ OBJECTS = \
 	gimpparasitelist.obj \
 	gimppattern.obj \
 	gimppickable.obj \
+	gimppdbprogress.obj \
 	gimppreviewcache.obj \
+	gimpprogress.obj \
 	gimpscanconvert.obj \
 	gimpselection.obj \
+	gimpstrokedesc.obj \
 	gimpstrokeoptions.obj \
 	gimptemplate.obj \
 	gimptooloptions.obj \

app/dialogs/Makefile.am

@@ -85,3 +85,6 @@ INCLUDES = \
 	-I$(top_srcdir)/app	\
 	$(GTK_CFLAGS)		\
 	-I$(includedir)
+
+EXTRA_DIST = \
+	makefile.msc

app/dialogs/makefile.msc

@@ -0,0 +1,84 @@
+# autogenerated from automake.am with automake.py
+# and slightly modified
+PACKAGE = appdialogs
+TOP = ..\..\..
+PRJ_TOP = ..\..
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
+
+INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
+	-I$(PRJ_TOP) \
+	-I$(PRJ_TOP)/app \
+	$(GTK2_CFLAGS) \
+
+DEFINES = \
+	-DG_LOG_DOMAIN=\"Gimp-Dialog\"
+
+PKG_LINK = \
+	$(GLIB_LIBS) $(GTK2_LIBS) \
+	..\base\appbase-$(PKG_VER).lib \
+	..\core\appcore-$(PKG_VER).lib \
+
+OBJECTS = \
+        about-dialog.obj \
+        channel-options-dialog.obj \
+        convert-dialog.obj \
+        dialogs-constructors.obj \
+        dialogs.obj \
+        file-open-dialog.obj \
+        file-open-location-dialog.obj \
+        file-save-dialog.obj \
+        grid-dialog.obj \
+        image-merge-layers-dialog.obj \
+        image-new-dialog.obj \
+        image-scale-dialog.obj \
+        info-dialog.obj \
+        info-window.obj \
+        layer-add-mask-dialog.obj \
+        layer-options-dialog.obj \
+        module-dialog.obj \
+        offset-dialog.obj \
+        palette-import-dialog.obj \
+        preferences-dialog.obj \
+        print-size-dialog.obj \
+        quit-dialog.obj \
+        resize-dialog.obj \
+        resolution-calibrate-dialog.obj \
+        scale-dialog.obj \
+        stroke-dialog.obj \
+        template-options-dialog.obj \
+        tips-dialog.obj \
+        tips-parser.obj \
+        user-install-dialog.obj \
+        vectors-export-dialog.obj \
+        vectors-import-dialog.obj \
+        vectors-options-dialog.obj \
+
+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
+
+RESOURCE = $(PACKAGE).res
+
+$(PACKAGE).lib : $(OBJECTS)
+	lib /out:$(PACKAGE).lib $(OBJECTS)
+
+$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) display-enums.obj $(PACKAGE).def
+	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).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) \
+	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+
+.c.obj :
+	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<

app/display/makefile.msc

@@ -47,14 +47,15 @@ OBJECTS = \
 	gimpdisplayshell-selection.obj \
 	gimpdisplayshell-title.obj \
 	gimpdisplayshell-transform.obj \
-	gimpnavigationview.obj \
+	gimpnavigationeditor.obj \
-	gimpprogress.obj \
 	gimpscalecombobox.obj \
 	gimpstatusbar.obj \
 #	display-enums.obj \
 
 all : \
 	$(PRJ_TOP)\config.h \
+	display-enums.obj \
+	gimpdisplayoptions.obj \
 	$(PACKAGE).lib \
 !IFDEF DLLGIMP
 	$(PACKAGE)-$(PKG_VER).dll

app/file/makefile.msc

@@ -12,6 +12,8 @@ OBJECTS = \
 	file-open.obj \
 	file-save.obj \
 	file-utils.obj \
+	gimprecentitem.obj \
+	gimprecentlist.obj \
 
 INCLUDES = \
 	-FImsvc_recommended_pragmas.h \

app/gimp.rc

@@ -1,2 +1,2 @@
-wilber			ICON	"wilber.ico"
+1	ICON	"wilber.ico"
-fileicon		ICON	"fileicon.ico"
+2	ICON	"fileicon.ico"

app/gimpcore.def

@@ -503,7 +503,6 @@ EXPORTS
 	gimp_orientation_type_get_type
 	gimp_paint_core_cancel
 	gimp_paint_core_cleanup
-	gimp_paint_core_constrain
 	gimp_paint_core_finish
 	gimp_paint_core_interpolate
 	gimp_paint_core_paint
@@ -536,7 +535,6 @@ EXPORTS
 	gimp_pickable_get_image_type
 	gimp_pickable_interface_get_type
 	gimp_pickable_pick_color
-	gimp_preview_size_get_type
 	gimp_projection_flush
 	gimp_projection_flush_now
 	gimp_projection_get_bytes
@@ -655,7 +653,6 @@ EXPORTS
 	hue_saturation_init
 	hue_saturation_partition_reset
 	levels_adjust_by_colors
-	levels_auto
 	levels_calculate_transfers
 	levels_channel_reset
 	levels_init
@@ -719,3 +716,37 @@ EXPORTS
 	gimp_display_options_fullscreen_get_type
 	gimp_display_options_get_type
 
+gimp_color_dialog_state_get_type
+gimp_container_filter
+gimp_context_set_palette
+gimp_convert_palette_type_get_type
+gimp_drawable_levels_stretch
+gimp_image_get_resolution
+gimp_image_get_unit
+gimp_image_parasite_find
+gimp_image_resize_to_layers
+gimp_imagefile_create_thumbnail_weak
+gimp_marshal_VOID__BOXED_ENUM
+gimp_navigation_editor_get_type
+gimp_navigation_editor_new
+gimp_navigation_editor_popup
+gimp_progress_box_get_type
+gimp_progress_box_new
+gimp_progress_cancel
+gimp_progress_end
+gimp_progress_get_value
+gimp_progress_interface_get_type
+gimp_progress_is_active
+gimp_progress_set_text
+gimp_progress_set_value
+gimp_progress_start
+gimp_stroke_desc_new
+gimp_tool_motion_constrain
+gimp_view_renderer_image_get_type
+gimp_view_renderer_imagefile_get_type
+gimp_view_renderer_layer_get_type
+gimp_view_renderer_vectors_get_type
+gimp_view_size_get_type
+levels_stretch
+plug_in_proc_def_get_sensitive
+file_utils_find_proc_by_extension

app/gui/makefile.msc

@@ -28,37 +28,12 @@ PKG_LINK = \
 	..\widgets\appwidgets-$(PKG_VER).lib \
 
 OBJECTS = \
-	about-dialog.obj \
 	color-history.obj \
-	color-notebook.obj \
-	convert-dialog.obj \
-	dialogs.obj \
-	dialogs-constructors.obj \
-	file-dialog-utils.obj \
-	file-new-dialog.obj \
-	file-open-dialog.obj \
-	file-open-location-dialog.obj \
-	file-save-dialog.obj \
-	grid-dialog.obj \
 	gui.obj \
 	gui-vtable.obj \
-	info-dialog.obj \
-	info-window.obj \
-	module-browser.obj \
-	offset-dialog.obj \
-	palette-import-dialog.obj \
-	preferences-dialog.obj \
-	quit-dialog.obj \
-	resize-dialog.obj \
-	resolution-calibrate-dialog.obj \
 	session.obj \
 	splash.obj \
-	stroke-dialog.obj \
 	themes.obj \
-	tips-dialog.obj \
-	tips-parser.obj \
-	user-install-dialog.obj \
-
 
 INCLUDES = \
 	-FImsvc_recommended_pragmas.h \

app/makefile.msc

@@ -15,7 +15,7 @@ includedir = $(PRJ_TOP)
 LT_RELEASE = $(PKG_VER)
 
 SUBDIRS = composite paint-funcs base config xcf core file text \
-	display paint vectors pdb plug-in tools widgets gui \
+	dialogs display paint vectors pdb plug-in tools widgets gui \
 	actions menus
 
 sub-all: 
@@ -53,6 +53,7 @@ PKG_LINK = \
 	menus/appmenus.lib \
 	tools/apptools.lib \
 	gui/appgui.lib \
+	dialogs/appdialogs.lib \
 	widgets/appwidgets.lib \
 	display/appdisplay.lib \
 	$(PRJ_TOP)/regexrepl/regexrepl.lib \
@@ -83,7 +84,7 @@ INCLUDES = \
 	-DG_LOG_DOMAIN=\"Gimp\" \
 	-DGIMP_APP_GLUE_COMPILATION \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/intl \
+	-I$(top_srcdir)/app \
 	$(GTK2_CFLAGS) \
 !IFNDEF PANGO_WIN32_EXTENDED
 	$(FONTCONFIG_CFLAGS) \

app/pdb/makefile.msc

@@ -37,19 +37,22 @@ OBJECTS = \
 	$(OBJECTS_UI) \
 	internal_procs.obj \
 	procedural_db.obj \
+	brush_cmds.obj \
 	brushes_cmds.obj \
 	channel_cmds.obj \
 	color_cmds.obj \
+	context_cmds.obj \
 	convert_cmds.obj \
 	display_cmds.obj \
 	drawable_cmds.obj \
+	drawable_transform_cmds.obj \
 	edit_cmds.obj \
 	fileops_cmds.obj \
 	floating_sel_cmds.obj \
 	fonts_cmds.obj \
 	font_select_cmds.obj \
 	gimprc_cmds.obj \
-	gradient_edit_cmds.obj \
+	gradient_cmds.obj \
 	gradients_cmds.obj \
 	guides_cmds.obj \
 	help_cmds.obj \
@@ -62,9 +65,11 @@ OBJECTS = \
 	palettes_cmds.obj \
 	parasite_cmds.obj \
 	paths_cmds.obj \
+	pattern_cmds.obj \
 	patterns_cmds.obj \
 	plug_in_cmds.obj \
 	procedural_db_cmds.obj \
+	progress_cmds.obj \
 	selection_cmds.obj \
 	selection_tools_cmds.obj \
 	text_tool_cmds.obj \

app/plug-in/makefile.msc

@@ -18,11 +18,13 @@ PKG_LINK = \
 
 OBJECTS = \
 	plug-in.obj \
+	plug-in-context.obj \
 	plug-in-debug.obj \
 	plug-in-def.obj \
 	plug-in-message.obj \
 	plug-in-params.obj \
-	plug-in-proc.obj \
+	plug-in-proc-def.obj \
+	plug-in-proc-frame.obj \
 	plug-in-progress.obj \
 	plug-in-rc.obj \
 	plug-in-run.obj \

app/tools/makefile.msc

@@ -95,6 +95,7 @@ OBJECTS = \
 	tool_manager.obj \
 	gimp-tools.obj \
 	tools-enums.obj \
+	tools-utils.obj \
 
 INCLUDES = \
 	-FImsvc_recommended_pragmas.h \

app/widgets/gimppropwidgets.c

@@ -1124,7 +1124,7 @@ gimp_prop_adjustment_notify (GObject       *config,
 
       g_object_get (config, param_spec->name, &uint64_value, NULL);
 
-#if defined _MSC_VER && (_MSC_VER < 1200)
+#if defined _MSC_VER && (_MSC_VER < 1300)
       value = (gint64) uint64_value;
 #else
       value = uint64_value;

app/widgets/makefile.msc

@@ -40,6 +40,7 @@ OBJECTS = \
 	gimpchanneltreeview.obj \
 	gimpclipboard.obj \
 	gimpcolorbar.obj \
+	gimpcolordialog.obj \
 	gimpcolordisplayeditor.obj \
 	gimpcoloreditor.obj \
 	gimpcolorframe.obj \
@@ -56,6 +57,7 @@ OBJECTS = \
 	gimpcontainertreeview-dnd.obj \
 	gimpcontainerview.obj \
 	gimpcontainerview-utils.obj \
+	gimpcontrollereditor.obj \
 	gimpcontrollerinfo.obj \
 	gimpcontrollerkeyboard.obj \
 	gimpcontrollerwheel.obj \
@@ -63,7 +65,6 @@ OBJECTS = \
 	gimpcursor.obj \
 	gimpdasheditor.obj \
 	gimpdataeditor.obj \
-	gimpdataselect.obj \
 	gimpdatafactoryview.obj \
 	gimpdeviceinfo.obj \
 	gimpdevices.obj \
@@ -82,6 +83,7 @@ OBJECTS = \
 	gimpenumstore.obj \
 	gimpenumwidgets.obj \
 	gimperrorconsole.obj \
+	gimperrordialog.obj \
 	gimpfgbgeditor.obj \
 	gimpfiledialog.obj \
 	gimpfileprocview.obj \
@@ -97,32 +99,25 @@ OBJECTS = \
 	gimpimagedock.obj \
 	gimpimageeditor.obj \
 	gimpimageview.obj \
-	gimpitemfactory.obj \
 	gimpitemtreeview.obj \
 	gimplayertreeview.obj \
 	gimpmenufactory.obj \
-	gimpnavigationpreview.obj \
+	gimpmessagebox.obj \
+	gimpmessagedialog.obj \
+	gimpnavigationview.obj \
 	gimppaletteeditor.obj \
 	gimppaletteselect.obj \
 	gimppatternfactoryview.obj \
 	gimppatternselect.obj \
 	gimppdbdialog.obj \
 	gimppluginaction.obj \
-	gimppreview.obj \
+	gimpprogressbox.obj \
-	gimppreview-popup.obj \
+	gimpprogressdialog.obj \
-	gimppreviewrenderer.obj \
-	gimppreviewrendererbrush.obj \
-	gimppreviewrendererdrawable.obj \
-	gimppreviewrenderergradient.obj \
-	gimppreviewrendererimage.obj \
-	gimppreviewrendererimagefile.obj \
-	gimppreviewrendererlayer.obj \
-	gimppreviewrenderervectors.obj \
-	gimppreviewrenderer-utils.obj \
 	gimppropwidgets.obj \
 	gimpselectiondata.obj \
 	gimpselectioneditor.obj \
 	gimpsessioninfo.obj \
+	gimpsizebox.obj \
 	gimpstringaction.obj \
 	gimpstrokeeditor.obj \
 	gimptemplateeditor.obj \
@@ -142,8 +137,22 @@ OBJECTS = \
 	gimpundoeditor.obj \
 	gimpunitstore.obj \
 	gimpvectorstreeview.obj \
+ 	gimpview.obj \
+ 	gimpview-popup.obj \
+	gimpviewablebox.obj \
 	gimpviewablebutton.obj \
 	gimpviewabledialog.obj \
+	gimpviewrenderer.obj \
+	gimpviewrenderer-frame.obj \
+ 	gimpviewrenderer-utils.obj \
+ 	gimpviewrendererbrush.obj \
+	gimpviewrendererbuffer.obj \
+ 	gimpviewrendererdrawable.obj \
+ 	gimpviewrenderergradient.obj \
+	gimpviewrendererimage.obj \
+	gimpviewrendererimagefile.obj \
+	gimpviewrendererlayer.obj \
+	gimpviewrenderervectors.obj \
 	gimpwidgets-constructors.obj \
 	gimpwidgets-utils.obj \
 	gtkhwrapbox.obj \

libgimp/makefile.msc

@@ -23,7 +23,7 @@ OPTIMIZE = -Zi -MD
 
 all : \
 	..\config.h \
-#	gimpi.lib \
+	gimpenums.c \
 	gimp-$(GIMP_VER).dll \
 	gimpui-$(GIMP_VER).dll
 
@@ -35,19 +35,23 @@ install : all
 	$(INSTALL) gimpui-$(GIMP_VER).dll $(BIN)
 
 PDB_WRAPPERS_O = \
+	gimpbrush_pdb.obj \
 	gimpbrushes_pdb.obj \
 	gimpbrushselect_pdb.obj \
 	gimpchannel_pdb.obj \
 	gimpcolor_pdb.obj \
+	gimpcontext_pdb.obj \
 	gimpconvert_pdb.obj \
 	gimpdisplay_pdb.obj \
 	gimpdrawable_pdb.obj \
+	gimpdrawabletransform_pdb.obj \
 	gimpedit_pdb.obj \
 	gimpfileops_pdb.obj \
 	gimpfloatingsel_pdb.obj \
 	gimpfonts_pdb.obj \
 	gimpfontselect_pdb.obj \
 	gimpgimprc_pdb.obj \
+	gimpgradient_pdb.obj \
 	gimpgradients_pdb.obj \
 	gimpgradientselect_pdb.obj \
 	gimpguides_pdb.obj \
@@ -62,10 +66,12 @@ PDB_WRAPPERS_O = \
 	gimppaletteselect_pdb.obj \
 	gimpparasite_pdb.obj \
 	gimppaths_pdb.obj \
+	gimppattern_pdb.obj \
 	gimppatterns_pdb.obj \
 	gimppatternselect_pdb.obj \
 	gimpplugin_pdb.obj \
 	gimpproceduraldb_pdb.obj \
+	gimpprogress_pdb.obj \
 	gimpselection_pdb.obj \
 	gimpselectiontools_pdb.obj \
 	gimptexttool_pdb.obj \
@@ -74,37 +80,29 @@ PDB_WRAPPERS_O = \
 	gimpunit_pdb.obj \
 
 
-# used by libgimp and core (?)
-gimpi_OBJECTS = \
-	gimpenv.obj \
-	gimpparasite.obj \
-	gimpparasiteio.obj \
-	gimpprotocol.obj \
-	gimputils.obj \
-#	gimpsignal.obj \
-	gimpwire.obj
-
-gimpi.lib : $(gimpi_OBJECTS)
-	lib /out:gimpi.lib $(gimpi_OBJECTS)
-
 gimp_OBJECTS = \
 	gimp.obj \
+	gimpenums.obj \
 	$(PDB_WRAPPERS_O) \
-#	$(gimpi_OBJECTS) \
+	gimpbrushes.obj \
 	gimpbrushselect.obj \
 	gimpchannel.obj \
 	gimpdrawable.obj \
 	gimpfontselect.obj \
+	gimpgradients.obj \
 	gimpgradientselect.obj \
-#	gimphelp.obj \
 	gimpimage.obj \
 	gimplayer.obj \
+	gimppalette.obj \
+	gimppalettes.obj \
 	gimppaletteselect.obj \
+	gimppatterns.obj \
 	gimppatternselect.obj \
 	gimppixelfetcher.obj \
 	gimppixelrgn.obj \
 	gimpplugin.obj \
 	gimpproceduraldb.obj \
+	gimpprogress.obj \
 	gimpregioniterator.obj \
 	gimpselection.obj \
 	gimptile.obj \
@@ -112,6 +110,23 @@ gimp_OBJECTS = \
 
 #?	gimpprotocol.obj \
 
+gimpenums.c: gimpenums.h gimpenums.c.tail
+	perl ..\tools\gimp-mkenums \
+		--fhead "#include \"config.h\"\n#include <glib-object.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"gimpenums.h\"" \
+		--fprod "\n/* enumerations from \"@filename@\" */" \
+		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
+		--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+		--vtail "    { 0, NULL, NULL }\n  };\n" \
+		--dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
+		--dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ }," \
+		--dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n \
+ if (! type)\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n   \
+     gimp_type_set_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\n \
+     gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
+	gimpenums.h > xgen-cec
+	type gimpenums.c.tail >> xgen-cec
+	copy xgen-cec gimpenums.c
+	del xgen-cec
 gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def
 	$(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(DEPLIBS) \
 	..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
@@ -124,19 +139,21 @@ gimp.obj : gimp.c
 	$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimp.c
 
 gimpui_OBJECTS = \
-	gimpui.obj \
+	gimpaspectpreview.obj \
 	gimpbrushmenu.obj \
 	gimpdrawablecombobox.obj \
+	gimpdrawablepreview.obj \
+	gimpexport.obj \
 	gimpfontmenu.obj \
 	gimpfontselect_pdb.obj \
 	gimpgradientmenu.obj \
-	gimpmenu.obj \
 	gimpimagecombobox.obj \
-	gimppatternmenu.obj \
+	gimpmenu.obj \
 	gimppalettemenu.obj \
+	gimppatternmenu.obj \
 	gimppixbuf.obj \
-	gimpexport.obj \
+	gimpprogressbar.obj \
-#	gimppatheditor.obj \
+	gimpui.obj \
 
 gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def
 	$(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) \

libgimpbase/gimpwin32-io.h

@@ -70,6 +70,17 @@ G_BEGIN_DECLS
 #define X_OK 0 /* not really */
 #endif
 
+/*
+2004-09-15  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/gwin32.h: Don't define ftruncate as a macro. Was never a
+	good idea, and it clashes with newest mingw headers, which have a
+	ftruncate implementation as an inline function. Thanks to Dominik R.
+ */
+/* needs coorection for msvc though ;( */
+#ifdef _MSC_VER
+#define ftruncate(f,s) g_win32_ftruncate(f,s)
+#endif
 
 G_END_DECLS
 

libgimpbase/makefile.msc

@@ -30,6 +30,7 @@ OBJECTS = \
 	gimpbaseenums.obj \
 	gimpbase-private.obj \
 	gimpbasetypes.obj \
+	gimpchecks.obj \
 	gimpdatafiles.obj \
 	gimpenv.obj \
 	gimpmemsize.obj \

libgimpthumb/gimpthumbnail.c

@@ -38,6 +38,8 @@
 
 #ifdef G_OS_WIN32
 #include "libgimpbase/gimpwin32-io.h"
+#include <process.h>
+#define _getpid getpid
 #endif
 
 #include "gimpthumb-types.h"

libgimpwidgets/gimppropwidgets.c

@@ -1124,7 +1124,7 @@ gimp_prop_adjustment_notify (GObject       *config,
 
       g_object_get (config, param_spec->name, &uint64_value, NULL);
 
-#if defined _MSC_VER && (_MSC_VER < 1200)
+#if defined _MSC_VER && (_MSC_VER < 1300)
       value = (gint64) uint64_value;
 #else
       value = uint64_value;

libgimpwidgets/makefile.msc

@@ -60,6 +60,8 @@ OBJECTS = \
 	gimppickbutton.obj \
 	gimppixmap.obj \
 	gimppreviewarea.obj \
+	gimppreview.obj \
+	gimpscrolledpreview.obj \
 	gimpquerybox.obj \
 	gimpsizeentry.obj \
 	gimpstock.obj \

plug-ins/helpbrowser/dialog.c

@@ -38,6 +38,10 @@
 #include "libgimp/gimp.h"
 #include "libgimp/gimpui.h"
 
+#ifdef G_OS_WIN32
+#include "libgimpbase/gimpwin32-io.h"
+#endif
+
 #include "dialog.h"
 #include "queue.h"
 #include "uri.h"

plug-ins/makefile.msc

@@ -34,8 +34,8 @@ FROMPLUGINSDIR=YES		# Used to bypass other parts below
 # The COMMON* ones are in the common subdirectory
 COMMON1 = AlienMap2 ccanalyze CEL channel_mixer 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 dicom diffraction displace edge emboss engrave exchange film flarefx fractaltrace
-COMMON3 = gauss gbr gee gee_zoom gif gifload gih glasstile gqbist gradmap grid gtm guillotine gz header hot illusion iwarp jigsaw jpeg laplace lic
+COMMON3 = gauss gbr gee gee_zoom gif gifload gih glasstile gqbist gradmap grid gtm guillotine header hot illusion iwarp jigsaw jpeg laplace lic
-COMMON4 = mapcolor max_rgb mblur mosaic newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar postscript psd psd_save psp randomize ripple rotate
+COMMON4 = mapcolor max_rgb mblur mosaic newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma png pnm polar postscript psd psd_save psp randomize ripple rotate
 COMMON5 = sample_colorize scatter_hsv screenshot sel_gauss semiflatten sharpen shift sinus smooth_palette snoise sobel sparkle spheredesigner spread struc sunras svg tga threshold_alpha tiff tile tileit tiler uniteditor unsharp video vinvert vpropagate 
 COMMON6 = warp waves webbrowser whirlpinch winclipboard wind winprint wiredebug xbm xwd zealouscrop
 
@@ -75,9 +75,6 @@ libs-clean :
 	@nmake -nologo -f makefile.msc sub-libs TARGET=clean
 
 sub-libs:
-	cd libgimpoldpreview
-	nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. LIBRARY=gimpoldpreview OBJECTS="gimpoldpreview.obj" $(TARGET)
-	cd ..
 	cd script-fu\siod
 	nmake -nologo -f ..\..\makefile.msc GIMPTOP=..\..\.. LIBRARY=siod OBJECTS="trace.obj slib.obj sliba.obj regex.obj" $(TARGET)
 	cd ..\..
@@ -232,8 +229,18 @@ OBJECTS = \
 
 !IFDEF EXTRA_dbbrowser
 OBJECTS = \
-	dbbrowser.obj \
+	gimpprocbox.obj \
-	dbbrowser_utils.obj
+	gimpprocbrowser.obj \
+	gimpprocview.obj \
+	procedure-browser.obj
+!ENDIF
+
+!IFDEF EXTRA_plugindetails
+OBJECTS = \
+	gimpprocbox.obj \
+	gimpprocbrowser.obj \
+	gimpprocview.obj \
+	plugin-browser.obj
 !ENDIF
 
 !IFDEF EXTRA_faxg3
@@ -277,6 +284,8 @@ STOCK_VARS = \
 	stock_polygon images/stock-polygon.png	\
 	stock_spiral images/stock-spiral.png	\
 	stock_star images/stock-star.png		\
+	stock_select_object images/stock-select-object.png \
+	stock_show_all images/stock-show-all.png \
 	stock_logo images/stock-logo.png
 
 STOCK_IMAGES = \
@@ -325,6 +334,38 @@ OBJECTS = \
 !ENDIF
 
 !IFDEF EXTRA_imagemap
+STOCK_VARS = \
+        stock_arrow             images/stock-arrow.png \
+        stock_circle            images/stock-circle.png        \
+        stock_coord             images/stock-coord.png \
+        stock_dimension         images/stock-dimension.png     \
+        stock_java              images/stock-java.png  \
+        stock_link              images/stock-link.png  \
+        stock_map_info          images/stock-map-info.png      \
+        stock_polygon           images/stock-polygon.png       \
+        stock_rectangle         images/stock-rectangle.png     \
+        stock_to_back           images/stock-to-back.png       \
+        stock_to_front          images/stock-to-front.png      \
+
+STOCK_IMAGES = \
+        images/stock-arrow.png \
+        images/stock-circle.png        \
+        images/stock-coord.png \
+        images/stock-dimension.png     \
+        images/stock-java.png  \
+        images/stock-link.png  \
+        images/stock-map-info.png      \
+        images/stock-polygon.png       \
+        images/stock-rectangle.png     \
+        images/stock-to-back.png       \
+        images/stock-to-front.png      \
+
+
+images/imap-stock-pixbufs.h: $(STOCK_IMAGES)
+	gdk-pixbuf-csource --rle --build-list $(STOCK_VARS) > images/imap-stock-pixbufs.h
+
+EXTRA_DEPS = images/imap-stock-pixbufs.h
+
 OBJECTS = \
 	imap_cmd_copy_object.obj \
 	imap_about.obj \
@@ -417,6 +458,34 @@ EXTRACFLAGS = -I$(MPEG)
 EXTRALIBS = $(MPEG)\release\libmpeg.lib
 !ENDIF
 
+!IFDEF EXTRA_pagecurl
+STOCK_VARS = \
+        curl0 curl0.png \
+        curl1 curl1.png \
+        curl2 curl2.png \
+        curl3 curl3.png \
+        curl4 curl4.png \
+        curl5 curl5.png \
+        curl6 curl6.png \
+        curl7 curl7.png \
+
+STOCK_IMAGES = \
+        curl0.png \
+        curl1.png \
+        curl2.png \
+        curl3.png \
+        curl4.png \
+        curl5.png \
+        curl6.png \
+        curl7.png \
+
+pagecurl-icons.h: $(STOCK_IMAGES)
+	gdk-pixbuf-csource --rle --build-list $(STOCK_VARS) > pagecurl-icons.h
+
+EXTRA_DEPS = pagecurl-icons.h
+
+!ENDIF
+
 !IFDEF EXTRA_png
 EXTRACFLAGS = -I$(PNG) -I$(ZLIB)
 EXTRALIBS = $(PNG)\libpng.lib $(ZLIB)\zlib.lib
@@ -437,12 +506,30 @@ EXTRALIBS = $(ZLIB)\zlib.lib user32.lib
 !ENDIF
 
 !IFDEF EXTRA_rcm
+STOCK_VARS = \
+        rcm_360         images/rcm-360.png     \
+        rcm_a_b         images/rcm-a-b.png     \
+        rcm_ccw         images/rcm-ccw.png     \
+        rcm_cw          images/rcm-cw.png      \
+
+STOCK_IMAGES = \
+        images/rcm-360.png     \
+        images/rcm-a-b.png     \
+        images/rcm-ccw.png     \
+        images/rcm-cw.png      \
+
+images/rcm-stock-pixbufs.h: $(STOCK_IMAGES)
+	gdk-pixbuf-csource --rle --build-list $(STOCK_VARS) > images/rcm-stock-pixbufs.h
+
+EXTRA_DEPS = images/rcm-stock-pixbufs.h
+
 OBJECTS = \
 	rcm.obj \
 	rcm_callback.obj \
 	rcm_dialog.obj \
 	rcm_gdk.obj \
-	rcm_misc.obj
+	rcm_misc.obj \
+	rcm_stock.obj
 OPTIMIZE = 
 !ENDIF
 
@@ -451,10 +538,12 @@ OBJECTS = \
 	siod-wrapper.obj \
 	script-fu.obj \
 	script-fu-console.obj \
-	script-fu-constants.obj \
 	script-fu-scripts.obj \
 	script-fu-text-console.obj \
-	..\dbbrowser\dbbrowser_utils.obj
+	script-fu-interface.obj \
+	..\dbbrowser\gimpprocbrowser.obj \
+	..\dbbrowser\gimpprocbox.obj \
+	..\dbbrowser\gimpprocview.obj
 EXTRALIBS = ..\..\regexrepl\regexrepl.lib siod\siod.lib kernel32.lib 
 EXTRACFLAGS = -DREGEX_MALLOC
 HAVE_RESOURCE = YES
@@ -528,10 +617,11 @@ OBJECTS = \
 !IFDEF EXTRA_helpbrowser
 OBJECTS = \
 	helpbrowser.obj	\
-	browser-win32.obj	\
+	dialog.obj	\
 	queue.obj		\
 	uri.obj
-EXTRALIBS = user32.lib shell32.lib
+EXTRACFLAGS = $(GTKHTML2_CFLAGS)
+EXTRALIBS = $(GTKHTML2_LIBS) user32.lib shell32.lib
 !ENDIF
 
 !IFDEF EXTRA_guash
@@ -635,9 +725,10 @@ RTL = -MDd
 CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm400
 
 CFLAGS = -FImsvc_recommended_pragmas.h \
-	-DHAVE_CONFIG_H $(EXTRACFLAGS) \
+	-DHAVE_CONFIG_H \
 	-DLOCALEDIR=\"?\" \
-	-I. -I$(GIMPTOP) -I$(PLUGINDIR) -I$(PLUGINDIR)\libgimpoldpreview \
+	-I$(GIMPTOP) -I. -I$(PLUGINDIR) \
+	$(EXTRACFLAGS) \
 	$(GTK2_CFLAGS) $(INTL_CFLAGS)
 
 LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)
@@ -671,7 +762,6 @@ $(PLUGIN).exe :  $(EXTRA_DEPS) $(OBJECTS) $(RESOURCE)
 	..\..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
 	..\..\libgimpmath\gimpmath-$(GIMP_VER).lib \
 	..\..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
-	..\libgimpoldpreview\gimpoldpreview.lib \
 	$(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) $(EXTRALIBS) $(LDFLAGS)
 
 $(PLUGIN).res : $(PLUGIN).rc

plug-ins/pygimp/makefile.msc

@@ -11,11 +11,11 @@ OBJECTS = \
   pygimp-parasite.obj \
   pygimp-pdb.obj
 
-PYTHON = ..\..\..\..\python22
+PYTHON = ..\..\..\..\python23
 !IFNDEF DEBUG
-EXTRALIBS = $(PYTHON)\libs\python22.lib user32.lib
+EXTRALIBS = $(PYTHON)\libs\python23.lib user32.lib
 !ELSE
-EXTRALIBS = $(PYTHON)\libs\python22_d.lib user32.lib
+EXTRALIBS = $(PYTHON)\libs\python23_d.lib user32.lib
 !ENDIF
 
 EXTRACFLAGS = -I$(PYTHON)\include

plug-ins/script-fu/scheme-wrapper.c

@@ -1199,9 +1199,11 @@ marshall_proc_db_call (LISP a)
   /*  reverse the return values  */
   return_val = nreverse (return_val);
 
+#ifndef G_OS_WIN32
   /*  if we're in server mode, listen for additional commands for 10 ms  */
   if (script_fu_server_get_mode ())
     script_fu_server_listen (10);
+#endif
 
 #ifdef GDK_WINDOWING_WIN32
   /* This seems to help a lot on Windoze. */
@@ -1233,7 +1235,9 @@ script_fu_menu_register_call (LISP a)
 static LISP
 script_fu_quit_call (LISP a)
 {
+#ifndef G_OS_WIN32
   script_fu_server_quit ();
+#endif
 
   return NIL;
 }

plug-ins/script-fu/script-fu.c

@@ -249,9 +249,12 @@ script_fu_run (const gchar      *name,
       /*
        *  The script-fu server for remote operation
        */
-
+#ifndef G_OS_WIN32
       script_fu_server_run (name, nparams, param,
 			    nreturn_vals, return_vals);
+#else
+	g_warning ("No script-fu server on win32");
+#endif
     }
   else if (strcmp (name, "plug_in_script_fu_eval") == 0)
     {

plug-ins/script-fu/siod-wrapper.c

@@ -1199,9 +1199,11 @@ marshall_proc_db_call (LISP a)
   /*  reverse the return values  */
   return_val = nreverse (return_val);
 
+#ifndef G_OS_WIN32
   /*  if we're in server mode, listen for additional commands for 10 ms  */
   if (script_fu_server_get_mode ())
     script_fu_server_listen (10);
+#endif
 
 #ifdef GDK_WINDOWING_WIN32
   /* This seems to help a lot on Windoze. */
@@ -1233,7 +1235,9 @@ script_fu_menu_register_call (LISP a)
 static LISP
 script_fu_quit_call (LISP a)
 {
+#ifndef G_OS_WIN32
   script_fu_server_quit ();
+#endif
 
   return NIL;
 }

themes/Default/images/makefile.msc

@@ -6,6 +6,8 @@ STOCK_VARIABLES = \
 	stock_cap_butt_16	stock-cap-butt-16.png \
 	stock_cap_round_16	stock-cap-round-16.png \
 	stock_cap_square_16	stock-cap-square-16.png \
+	stock_center_16		stock-center-16.png \
+	stock_center_24		stock-center-24.png \
 	stock_channel_16		stock-channel-16.png	\
 	stock_channel_24		stock-channel-24.png	\
 	stock_channel_32		stock-channel-32.png	\
@@ -64,6 +66,7 @@ STOCK_VARIABLES = \
 	stock_floating_selection_24	stock-floating-selection-24.png \
 	stock_floating_selection_32	stock-floating-selection-32.png \
 	stock_floating_selection_48	stock-floating-selection-48.png \
+	stock_frame_64		stock-frame-64.png \
 	stock_gradient_bilinear_16		stock-gradient-bilinear-16.png	\
 	stock_gradient_conical_asymmetric_16		stock-gradient-conical-asymmetric-16.png	\
 	stock_gradient_conical_symmetric_16		stock-gradient-conical-symmetric-16.png	\
@@ -137,6 +140,8 @@ STOCK_VARIABLES = \
 	stock_paths_22		stock-paths-22.png	\
 	stock_plugin_16		stock-plugin-16.png	\
 	stock_portrait_16		stock-portrait-16.png	\
+	stock_print_resolution_16	stock-print-resolution-16.png \
+	stock_print_resolution_24	stock-print-resolution-24.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	\