From 6172bba31742c5c956217bb466f1f486a7dd85b6 Mon Sep 17 00:00:00 2001
From: sdteffen <sdteffen>
Date: Sat, 1 Feb 2003 18:02:39 +0000
Subject: [PATCH] preparing 0.91-pre1 release on windows

---
 ChangeLog             | 10 ++++++++++
 app/lineprops_area.c  | 10 ++++++++++
 app/makefile.msc      |  2 +-
 config.h.win32        |  4 ++++
 lib/makefile.msc      |  3 ++-
 makefile.msc          |  1 +
 plug-ins/makefile.msc |  1 +
 7 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a569571a..72509f52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-02-01  Steffen Macke <sdteffen@web.de>
+
+	* app/lineprops_area.c: latest changes do not work on
+	windows, using old code without tooltips
+	* makefile.msc: fixed copying of wmf.dll
+	* plug-ins/makefile.msc: 
+	* app/makefile.msc:
+	* lib/makefile.msc: now linking libintl
+	* config.h.win32: enabling native language support
+
 2003-01-31  Daniel Yacob  <locales@geez.org>
 
 	* configure.in: Added am (Amharic) to ALL_LINGUAS.
diff --git a/app/lineprops_area.c b/app/lineprops_area.c
index b52eba75..4a12b676 100644
--- a/app/lineprops_area.c
+++ b/app/lineprops_area.c
@@ -487,12 +487,22 @@ dia_arrow_chooser_new(gboolean left, DiaChangeArrowCallback callback,
   menu = gtk_menu_new();
   gtk_object_set_data_full(GTK_OBJECT(chooser), button_menu_key, menu,
 			   (GtkDestroyNotify)gtk_widget_unref);
+#ifndef G_OS_WIN32
   for (i = 0; arrow_types[i].name != NULL; i++) {
+#else
+  for (i = 0; i<= ARROW_BLANKED_CONCAVE; i++) {
+#endif
     mi = gtk_menu_item_new();
+#ifndef G_OS_WIN32
     gtk_object_set_data(GTK_OBJECT(mi), menuitem_enum_key,
 			GINT_TO_POINTER(arrow_types[i].enum_value));
     gtk_tooltips_set_tip(tool_tips, mi, arrow_types[i].name, NULL);
     ar = dia_arrow_preview_new(arrow_types[i].enum_value, left);
+#else
+    gtk_object_set_data(GTK_OBJECT(mi), menuitem_enum_key, GINT_TO_POINTER(i)); 
+    ar = dia_arrow_preview_new(i, left);                  
+#endif
+    ar = dia_arrow_preview_new(i, left);                                        
     gtk_container_add(GTK_CONTAINER(mi), ar);
     gtk_widget_show(ar);
     gtk_signal_connect(GTK_OBJECT(mi), "activate",
diff --git a/app/makefile.msc b/app/makefile.msc
index 036b7084..0413a929 100644
--- a/app/makefile.msc
+++ b/app/makefile.msc
@@ -17,7 +17,7 @@ PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
 PKG_LINK = $(GTK2_LIBS) $(GLIB_LIBS) $(PANGOWIN32_LIBS) \
 	$(LIBXML2_LIBS) $(PNG_LIBS) \
 	$(PRJ_TOP)\lib\libdia.lib $(LIBART_LIBS) \
-	$(GDK_PIXBUF_LIBS)
+	$(GDK_PIXBUF_LIBS) $(INTL_LIBS)
 
 OBJECTS = \
 	autosave.obj \
diff --git a/config.h.win32 b/config.h.win32
index 249e40ad..802ec5c7 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -10,6 +10,10 @@
 #define HAVE_GDK_PIXBUF
 #define HAVE_DIRENT_H
 
+#define ENABLE_NLS
+#define GETTEXT_PACKAGE "dia"
+#define LOCALEDIR "../lib/locale"
+
 #define VERSION "0.91-pre1"
 
 /*
diff --git a/lib/makefile.msc b/lib/makefile.msc
index 48d3bdcd..bb8e69fd 100644
--- a/lib/makefile.msc
+++ b/lib/makefile.msc
@@ -16,7 +16,8 @@ PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
 
 PKG_LINK = $(GTK2_LIBS)  $(PANGOWIN32_LIBS) $(GLIB_LIBS) \
 	$(LIBXML2_LIBS) $(ZLIB_LIBS) \
-	$(LIBART_LIBS) $(GDK_PIXBUF_LIBS)
+	$(LIBART_LIBS) $(GDK_PIXBUF_LIBS) \
+	$(INTL_LIBS)
 
 OBJECTS = \
 	arrows.obj \
diff --git a/makefile.msc b/makefile.msc
index 4f0bcc59..5ca8e365 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -31,6 +31,7 @@ all: 	build \
 	build\win32\dia\pstricks.dll \
 	build\win32\dia\shape.dll \
 	build\win32\dia\svg.dll \
+	build\win32\dia\wmf.dll \
 	build\win32\dia\wpg.dll \
 	build\win32\dia\xfig.dll \
 	build\win32\lib \
diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc
index 957736f0..b328f4b7 100644
--- a/plug-ins/makefile.msc
+++ b/plug-ins/makefile.msc
@@ -38,6 +38,7 @@ PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
 
 PKG_LINK = $(GTK2_LIBS) $(GLIB_LIBS) \
 	$(LIBXML2_LIBS) $(GDK_PIXBUF_LIBS) \
+	$(INTL_LIBS) \
 	$(PRJ_TOP)\lib\libdia.lib
 
 #
-- 
2.11.4.GIT