summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Hofmann <johannes.hofmann@gmx.de>2004-10-26 15:22:45 +0000
committerJohannes Hofmann <johannes.hofmann@gmx.de>2004-10-26 15:22:45 +0000
commit80fc6a294bc29cc5da83cf3195bfc1913c0f3271 (patch)
tree1e9f99740c0083931d4c6b38b3b024048bfa4556
parentbc7e8e0a1617eb26ec38b2a4e433efc9c7f85f6a (diff)
- reload if DONE received from gs - fix warning in PSEditWidget.cxx
- reload if DONE received from gs - fix warning in PSEditWidget.cxx
-rw-r--r--Makefile2
-rw-r--r--src/GsWidget.cxx6
-rw-r--r--src/PSEditWidget.cxx4
3 files changed, 5 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 227f855..b7062f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CFLAGS=-I/usr/X11R6/include -g -Wall
+CFLAGS=-I/usr/X11R6/include -g
CC=c++
OBJECTS=GsWidget.o PSEditWidget.o PSEditor.o PSEditText.o PSEditModel.o Postscript.o flpsed.o
diff --git a/src/GsWidget.cxx b/src/GsWidget.cxx
index 7765e1b..7b50b6f 100644
--- a/src/GsWidget.cxx
+++ b/src/GsWidget.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: GsWidget.cxx,v 1.9 2004/10/24 18:28:37 hofmann Exp $"
+// "$Id: GsWidget.cxx,v 1.10 2004/10/26 17:22:45 hofmann Exp $"
//
// GsWidget routines.
//
@@ -157,7 +157,6 @@ int GsWidget::load(int fd) {
argv[1] = "-dSAFER";
argv[2] = "-dQUIET";
argv[3] = "-sDEVICE=x11alpha";
- // argv[4] = "-sPAPERSIZE=a4";
argv[4] = "-dNOPLATFONTS";
argv[5] = "-";
argv[6] = NULL;
@@ -219,8 +218,7 @@ int GsWidget::handleX11(int ev) {
damage(FL_DAMAGE_ALL);
fl_cursor(FL_CURSOR_DEFAULT);
} else if(fl_xevent->xclient.message_type == atoms[4] ) {
- kill_gs();
- fl_cursor(FL_CURSOR_DEFAULT); // DONE received
+ reload(); // go back to page 1
}
return 1;
}
diff --git a/src/PSEditWidget.cxx b/src/PSEditWidget.cxx
index 47255d8..4186504 100644
--- a/src/PSEditWidget.cxx
+++ b/src/PSEditWidget.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: PSEditWidget.cxx,v 1.22 2004/10/23 20:00:51 hofmann Exp $"
+// "$Id: PSEditWidget.cxx,v 1.23 2004/10/26 17:22:45 hofmann Exp $"
//
// PSEditWidget routines.
//
@@ -154,7 +154,7 @@ void PSEditWidget::move(int x1, int y1, int last_x, int last_y) {
void PSEditWidget::rm_char() {
PSEditText *t;
- int width;
+ double width;
t = model->get_cur_text();
if (t) {