Print.cpp
c:\programs\upp-svn\uppsrc\ide\Print.cpp:69: error: expected `)' before '&' token
c:\programs\upp-svn\uppsrc\ide\Print.cpp:124: error: expected `}' at end of input
c:\programs\upp-svn\uppsrc\ide\Print.cpp:67: error: expected unqualified-id at end of input

@@ -1,26 +1,25 @@
 #include "ide.h"
 
-class PrintDlg : public WithPrintLayout<TopWindow> {
-	typedef PrintDlg CLASSNAME;
-
+class PrintDialog : public WithPrintLayout<TopWindow> {
 public:
-	PrintDlg();
+	typedef PrintDialog CLASSNAME;
+	PrintDialog();
 };
 
-PrintDlg::PrintDlg()
+PrintDialog::PrintDialog()
 {
 	CtrlLayoutOKCancel(*this, "Print");
 	columns <<= 1;
 	orientation <<= 0;
 	line <<= 100;
 }
 
 INITBLOCK {
-	RegisterGlobalConfig("PrintDlg");
-};
+	RegisterGlobalConfig("PrintDialog");
+}
 
 struct Printer {
 	Draw& w;
 	Size  page;
 	int   cols;
 	int   line;
@@ -63,15 +62,13 @@
 				x++;
 			}
 		}
 		NextLine();
 	}
 	
-	Printer(PrintDlg& dlg, Draw& w, int tabs) : w(w), tabs(tabs) {
-		cols = ~dlg.columns;
-		line = ~dlg.line;
+	Printer(Draw& w, int cols, int line, int tabs) : w(w), cols(cols), line(line), tabs(tabs) {
 		page = w.GetPagePixels();
 		columncx = page.cx / cols;
 		cx = page.cx / cols - 100;
 		int l = 0;
 		int h = 1000;
 		while(l < h) {
@@ -86,25 +83,26 @@
 		fcx = fi.GetWidth('x');
 		fcy = fi.GetHeight();
 		lines = page.cy / fcy;
 		y = coli = 0;
 		w.StartPage();
 	}
+
 	~Printer() {
 		w.EndPage();
 	}
 };
 
 void Ide::Print()
 {
 	if(designer)
 		return;
-	PrintDlg dlg;
-	LoadFromGlobal(dlg, "PrintDlg");
+	PrintDialog dlg;
+	LoadFromGlobal(dlg, "PrintDialog");
 	int c = dlg.Execute();
-	StoreToGlobal(dlg, "PrintDlg");
+	StoreToGlobal(dlg, "PrintDialog");
 	if(c != IDOK)
 		return;
 	PrinterJob job;
 	job.Landscape(dlg.orientation);
 	if(!job.Execute())
 		return;
@@ -115,10 +113,10 @@
 		h = editor.GetLine(h);
 	}
 	else {
 		l = 0;
 		h = editor.GetLineCount() - 1;
 	}
-	Printer p(dlg, job, editor.GetTabSize());
+	Printer p(job, ~dlg.columns, ~dlg.line, editor.GetTabSize());
 	for(int i = l; i <= h; i++)
 		p.PrintLine(editor.GetWLine(i));
 }

#ifdef PrintDlg
	#undef PrintDlg
#endif