renamed GimpOrientationType with Compat postfix to avoid name clashing

2003-07-26  Hans Breuer  <hans@breuer.org>

	* libgimp/gimpcompat.h : renamed GimpOrientationType
	with Compat postfix to avoid name clashing when using
	this header together with libgimp/gimpenums.h

	* app/composite/makefile.msc : (new file)
	  **/makefile.msc : updated

	* libgimp/gimp.c : use static defined _tile<widht|height>
	in this file instead of function call

	* libgimp/gimp.def libgimp/libgimpui.def : moved from former
	to latter : gimp_<brush|font|gradient|pattern>_select_<new|destroy>
	added to former gimp_<brushes|gradients|patterns>_popup

	* app/paint/gimppaintcore.h : removed double semicolon
	which gave msvc error C2059: syntax error : ';'

	* libgimpbase/gimpwin32-io.h : (new file) compatibilty defines
	which were spread over multiple files to make up mostly for
	missing unistd.h

	* app/base/tile-swap.c app/core/gimpimagefile.c
	  libgimpbase/gimpdatafiles.c
	  plug-ins/FractalExplorer/FractalExplorer.c : use new header

	* plug-ins/gflare/gflare.c
	  plug-ins/flame/flame.c
	  plug-ins/FractalExplorer/Dialogs.c :
	removed #ifdef G_OS_WIN32 special casing, not needed anymore
	due to g_file_test() usage

	* app/text/*.* : changes required for build with PangoWin32,
	but not commited ...

libgimp/gimp.c

@@ -1525,7 +1525,7 @@ gimp_config (GPConfig *config)
        * transfering tile data
        */
       gchar fileMapName[128];
-      gint  tileByteSize = gimp_tile_width () * gimp_tile_height () * 4;
+      gint  tileByteSize = _tile_width * _tile_height * 4;
 
       /* From the id, derive the file map name */
       g_snprintf (fileMapName, sizeof (fileMapName), "GIMP%d.SHM", _shm_ID);

libgimp/gimp.def

@@ -3,10 +3,9 @@ EXPORTS
 	gimp_airbrush_default
 	gimp_attach_new_parasite
 	gimp_blend
-	gimp_brush_select_destroy
-	gimp_brush_select_new
 	gimp_brushes_close_popup
 	gimp_brushes_get_brush_data
+	gimp_brushes_popup
 	gimp_brushes_set_popup
 	gimp_bucket_fill
 	gimp_by_color_select
@@ -99,8 +98,6 @@ EXPORTS
 	gimp_floating_sel_remove
 	gimp_floating_sel_rigor
 	gimp_floating_sel_to_layer
-	gimp_font_select_destroy
-	gimp_font_select_new
 	gimp_fonts_close_popup
 	gimp_fonts_popup
 	gimp_fonts_set_popup
@@ -114,13 +111,12 @@ EXPORTS
 	gimp_get_progname
 	gimp_gimprc_query
 	gimp_gimprc_set
-	gimp_gradient_select_destroy
-	gimp_gradient_select_new
 	gimp_gradients_close_popup
 	gimp_gradients_get_gradient
 	gimp_gradients_get_gradient_data
 	gimp_gradients_get_gradient_data
 	gimp_gradients_get_list
+	gimp_gradients_popup
 	gimp_gradients_sample_custom
 	gimp_gradients_sample_uniform
 	gimp_gradients_set_gradient
@@ -266,10 +262,9 @@ EXPORTS
 	gimp_path_set_points
 	gimp_path_set_tattoo
 	gimp_path_stroke_current
-	gimp_pattern_select_destroy
-	gimp_pattern_select_new
 	gimp_patterns_close_popup
 	gimp_patterns_get_pattern_data
+	gimp_patterns_popup
 	gimp_patterns_set_popup
 	gimp_pencil
 	gimp_perspective
@@ -328,6 +323,7 @@ EXPORTS
 	gimp_show_tool_tips
 	gimp_smudge
 	gimp_smudge_default
+	gimp_temp_PDB_name
 	gimp_temp_name
 	gimp_text
 	gimp_text_fontname

libgimp/gimpcompat.h

@@ -124,7 +124,7 @@ enum
   GIMP_HORIZONTAL = GIMP_ORIENTATION_HORIZONTAL,
   GIMP_VERTICAL   = GIMP_ORIENTATION_VERTICAL,
   GIMP_UNKNOWN    = GIMP_ORIENTATION_UNKNOWN
-} GimpOrientationType;
+} GimpOrientationTypeCompat;
 
 G_END_DECLS
 

libgimp/gimpui.def

@@ -1,6 +1,8 @@
 EXPORTS
-	gimp_brush_select_widget_close
+	gimp_brush_select_new
+	gimp_brush_select_destroy
 	gimp_brush_select_widget_new
+	gimp_brush_select_widget_close
 	gimp_brush_select_widget_set
 	gimp_channel_menu_new
 	gimp_drawable_menu_new
@@ -15,16 +17,19 @@ EXPORTS
 	gimp_fixme_preview_new2
 	gimp_fixme_preview_put_pixel
 	gimp_fixme_preview_update
-	gimp_font_select_widget_close
+	gimp_font_select_new
 	gimp_font_select_widget_new
+	gimp_font_select_widget_close
 	gimp_font_select_widget_set
-	gimp_gradient_select_widget_close
+	gimp_gradient_select_new
 	gimp_gradient_select_widget_new
+	gimp_gradient_select_widget_close
 	gimp_gradient_select_widget_set
 	gimp_image_menu_new
 	gimp_layer_menu_new
-	gimp_pattern_select_widget_close
+	gimp_pattern_select_new
 	gimp_pattern_select_widget_new
+	gimp_pattern_select_widget_close
 	gimp_pattern_select_widget_set
 	gimp_plug_in_get_path
 	gimp_ui_init

libgimp/makefile.msc

@@ -26,6 +26,11 @@ DEPLIBS = $(GLIB_LIBS) $(INTL_LIBS)
 
 # CFLAGS = $(GLIB_CFLAGS) 
 
+!IFNDEF DEBUG
+# Debug Release!
+OPTIMIZE = -Zi -MD
+!ENDIF
+
 all : \
 	..\config.h \
 #	gimpi.lib \
@@ -57,11 +62,11 @@ PDB_WRAPPERS_O = \
 	gimpguides_pdb.obj \
 	gimphelp_pdb.obj \
 	gimpimage_pdb.obj \
-	gimppainttools_pdb.obj \
 	gimplayer_pdb.obj \
 	gimpmessage_pdb.obj \
 	gimpmisc_pdb.obj \
 	gimpmisctools_pdb.obj \
+	gimppainttools_pdb.obj \
 	gimppalette_pdb.obj \
 	gimpparasite_pdb.obj \
 	gimppaths_pdb.obj \
@@ -76,6 +81,7 @@ PDB_WRAPPERS_O = \
 	gimpundo_pdb.obj \
 	gimpunit_pdb.obj \
 
+
 # used by libgimp and core (?)
 gimpi_OBJECTS = \
 	gimpenv.obj \
@@ -95,7 +101,7 @@ gimp_OBJECTS = \
 #	$(gimpi_OBJECTS) \
 	gimpchannel.obj \
 	gimpdrawable.obj \
-	gimphelp.obj \
+#	gimphelp.obj \
 	gimpimage.obj \
 	gimplayer.obj \
 	gimpmisc.obj \
@@ -121,10 +127,15 @@ gimp.obj : gimp.c
 gimpui_OBJECTS = \
 	gimpui.obj \
 	gimpbrushmenu.obj \
+	gimpbrushselect.obj \
 	gimpfontmenu.obj \
+	gimpfontselect.obj \
+	gimpfontselect_pdb.obj \
 	gimpgradientmenu.obj \
+	gimpgradientselect.obj \
 	gimpmenu.obj \
 	gimppatternmenu.obj \
+	gimppatternselect.obj \
 	gimpexport.obj \
 	gimpmiscui.obj \
 #	gimppatheditor.obj \