--- ./Makefile.in	Wed Jan  9 09:31:49 2002
+++ ../xpp-1.1/./Makefile.in	Mon Nov 18 17:37:20 2002
@@ -284,41 +284,20 @@
 
 %.o: %.c
 	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
+	$(COMPILE) -c $<
 
 %.lo: %.c
 	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
+	$(LTCOMPILE) -c $<
 
 %.o: %.cxx
 	@echo '$(CXXCOMPILE) -c $<'; \
-	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
+	$(CXXCOMPILE) -c $<
 
 %.lo: %.cxx
 	@echo '$(LTCXXCOMPILE) -c $<'; \
-	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
+	$(LTCXXCOMPILE) -c $<
+
 info-am:
 info: info-am
 dvi-am:
--- ./cupshelper.cxx	Wed Jan  9 08:34:17 2002
+++ ../xpp-1.1/./cupshelper.cxx	Mon Nov 18 17:37:20 2002
@@ -67,7 +67,7 @@
 	return port_;
 }
 
-void CupsHelper::setHostInfo(const char *host, int port = 631){
+void CupsHelper::setHostInfo(const char *host, int port){
 	strcpy(host_,host);
 	cupsSetServer(host_);
 	port_ = port;
@@ -74,7 +74,7 @@
 	ippSetPort(port_);
 }
 
-void CupsHelper::setLoginInfo(const char *usr = 0, const char *pwd = 0){
+void CupsHelper::setLoginInfo(const char *usr, const char *pwd){
 	strcpy(login_,usr);
 	cupsSetUser(login_);
 	strcpy(password_,pwd);
--- ./mainwindow.fl	Wed Jan 16 16:01:55 2002
+++ ../xpp-1.1/./mainwindow.fl	Mon Nov 18 17:38:26 2002
@@ -1,10 +1,7 @@
 # data file for the Fltk User Interface Designer (fluid)
 version 1.0100 
 header_name {.h} 
-code_name {.cxx} 
-gridx 5 
-gridy 5 
-snap 3
+code_name {.cxx}
 class xppMainWindow {open
 } {
   decl {int printstat;} {public
@@ -11,13 +8,15 @@
   }
   decl {printFiles *print;} {public
   }
-  Function {xppMainWindow(int  argc, char *argv[], int &exitstat)} {} {
+  Function {xppMainWindow(int  argc, char *argv[], int &exitstat)} {open
+  } {
     code {exitstat = 0;
 print=new printFiles(argc,argv,exitstat);
 if (exitstat != 0) return;} {}
     Fl_Window mainWindow {
-      label {X Printing Panel}
-      xywh {174 59 520 365} hide resizable
+      label {X Printing Panel} selected
+      xywh {25 76 520 365} resizable
+      code0 {optionDialog = NULL;} visible
     } {
       Fl_Group {} {
         private xywh {5 5 510 55} box UP_BOX
@@ -27,7 +26,7 @@
           private xywh {10 10 500 30} labeltype SHADOW_LABEL labelfont 3 labelsize 24 labelcolor 136
         }
         Fl_Box {} {
-          label {Version 1.1 by Till Kamppeter (January 2002)} selected
+          label {Version 1.1 by Till Kamppeter (January 2002)}
           private xywh {10 40 500 15} labelsize 12
         }
       }
@@ -127,7 +126,8 @@
   Function {~xppMainWindow()} {} {
     code {delete print;} {}
   }
-  Function {xppOptionDialog()} {} {
+  Function {xppOptionDialog()} {open
+  } {
     code {int i;
 const char *str;
 print->setDest();
@@ -155,12 +155,12 @@
       print->num_changed_options,
       &(print->changed_options));} {}
     Fl_Window optionDialog {
-      label {Printing Options}
-      xywh {139 86 542 468} hide
+      label {Printing Options} open
+      xywh {94 325 540 465}
       code0 {\#include "xpp.h"}
       code1 {char str[256];}
       code2 {sprintf(str,"Options for %s",print->menu_strs[print->dest_pos]);}
-      code3 {o->label(str);} modal
+      code3 {o->label(str);} modal visible
     } {
       Fl_Tabs optionGroups {
         xywh {5 5 530 425}
--- ./inputslider.h	Wed Jan 17 16:24:47 2001
+++ ../xpp-1.1/./inputslider.h	Tue Dec 10 18:13:09 2002
@@ -85,18 +85,18 @@
     void input_box(Fl_Boxtype s) {
       inputfield_->box(Fl_Widget::box());
     }
-    void color(Fl_Color s) {
+    void color(unsigned s) {
       Fl_Widget::color(s);
       slider_->color(Fl_Widget::color());
     }
-    void input_color(Fl_Color s) {
+    void input_color(unsigned s) {
       inputfield_->color(Fl_Widget::color());
     }
-    void selection_color(Fl_Color s) {
+    void selection_color(unsigned s) {
       Fl_Widget::selection_color(s);
       slider_->selection_color(Fl_Widget::selection_color());
     }
-    void input_selection_color(Fl_Color s) {
+    void input_selection_color(unsigned s) {
       inputfield_->selection_color(Fl_Widget::selection_color());
     }
     // Manipulate the parameters for the slider