- Fixed bug with exporting beziers to SVG

- Added support for text cursor movement when editting text
- Added emacs keys for text edits (ctrl-u, ctrl-k, ctrl-a)
- Added export to PNG format
- Export to PNG/BMP now no longer include gridlines/statusbar/scrollbars
- Fixed crash when changing to zero gridsize

CHANGELOG

@@ -3,6 +3,22 @@ Ideas for future versions:
   Solaris (and possibly other platforms)
 - Perhaps change to SVG for objects
 
+Version 1.9:
+- Fixed bug with exporting beziers to SVG
+- Added support for text cursor movement when editting text
+- Added emacs keys for text edits (ctrl-u, ctrl-k, ctrl-a)
+- Added export to PNG format
+- Export to PNG/BMP now no longer include gridlines/statusbar/scrollbars
+- Fixed crash when changing to zero gridsize
+- now re-calcing scrollbar size whenever diagram is modified
+- can no longer accidentally change maps while scrolling vertically
+- fixed graphical glitch when editting text while scrolled
+- clicking mouse while entering text is now the same as pressing enter
+- findnext now works again 
+- when searching, the found object is more obviously highlighted 
+
+
+=======
 Version 1.8d:
 - Fixed bug with Ellipse objects when exporting to SVG
 - Fixed slowdown when creating new links 
@@ -16,6 +32,7 @@ Version 1.8c:
 - when searching, the found object is more obviously highlighted 
 
 
+>>>>>>> .r60
 Version 1.8b:
 - Fixed placement of text fields in dialog screens
 

constants.h

@@ -1,4 +1,4 @@
-#define VERSION "1.8d"
+#define VERSION "1.9"
 
 /* variable sizes */
 #define SMALLBUFLEN 64		/* small text buffer */

dist.sh

@@ -15,7 +15,8 @@ rm -rf ${FULLNAME}
 
 
 mkdir ${FULLNAME}
-cp README.txt INSTALL.txt objects.dat buttons.dat netmapr.exe netmapr.c netmapr.h constants.h convert.c convert.h verdana.ttf example.map icon.bmp windows_files/*.dll ${FULLNAME}/
+#cp README.txt INSTALL.txt objects.dat buttons.dat netmapr.exe netmapr.c netmapr.h constants.h convert.c convert.h verdana.ttf example.map icon.bmp windows_files/*.dll ${FULLNAME}/
+cp README.txt INSTALL.txt objects.dat buttons.dat netmapr.exe netmapr.c netmapr.h constants.h convert.c convert.h verdana.ttf example.map icon.bmp dlls/*.dll ${FULLNAME}/
 cp -R doc ${FULLNAME}/
 rm -rf ${FULLNAME}/doc/CVS
 rm -rf ${FULLNAME}/doc/.svn

netmapr.h

@@ -1,5 +1,14 @@
 #include "constants.h"
 
+#ifndef __CONSTANTS_H
+#define __CONSTANTS_H
+#ifdef WINDOWS
+#define STDOUT	(FILE *)1
+#else
+#define STDOUT	stdout
+#endif
+#endif
+
 typedef struct {
 	int x;
 	int y;
@@ -206,7 +215,7 @@ void drawlinkSVG(link_t *l);
 void drawobject(SDL_Surface *dest, mapobject_t *o, int doublebuffer, int adjust);
 void drawobjectSVG(SDL_Surface *dest, mapobject_t *o, int doublebuffer);
 void drawpixel(SDL_Surface *screen, int x, int y, SDL_Color c);
-void drawmap(void);
+void drawmap(int wantdecs);
 void drawmapbox(void);
 void drawobox(void);
 void drawscreen(void);