Changeset 101

Timestamp:

04/13/06 19:19:14 (2 years ago)

Author:

qbert

Message:

Updated to work with dmd 154

changed scope to _scope in printing/printdialog.d printing/printerdata.d dwt/custom/styledtext.d

updated make-dwt-lib.bat to not include -w because of erroneous 'statement unreachable' errors.

Files:

• trunk/current/win32/import/dwt/custom/styledtext.d (modified) (3 diffs)
• trunk/current/win32/import/dwt/printing/printdialog.d (modified) (7 diffs)
• trunk/current/win32/import/dwt/printing/printerdata.d (modified) (1 diff)
• trunk/current/win32/import/make-dwt-lib.bat (modified) (1 diff)

trunk/current/win32/import/dwt/custom/styledtext.d

@@ -292 +292 @@
-        startPage_var = 1;
-        endPage_var = Integer.MAX_VALUE;
-
+_
-            startPage_var = data.startPage;
-            endPage_var = data.endPage;
@@ -302 +302 @@
-        } 
-        else 
-
+_
-            selection = parent.getSelectionRange();
-        }
@@ -530 +530 @@
-        }
-        PrinterData data = printer.getPrinterData();
-
+_
-            startLine = (startPage_var - 1) * pageSize;
-        } 
-        else
-
+_
-            startLine = content.getLineAtOffset(selection.x);
-            if (selection.y > 0) {

trunk/current/win32/import/dwt/printing/printdialog.d

@@ -40 +40 @@
-
-
-
+_
-    int startPage = 1, endPage = 1;
-    boolean printToFile = false;
@@ -130 +130 @@
-
-/**
-
+_
- * before pressing OK in the dialog. This will be one
- * of the following values:
@@ -142 +142 @@
- * </dl>
- *
-
+_
- */
-public int getScope() {
-
+_
-}
-
@@ -163 +163 @@
- * @param scope the scope setting when the dialog is opened
- */
-
-scope = 
+_
+_scope = _
-}
-
@@ -268 +268 @@
-    
-    if (printToFile) pd.Flags |= OS.PD_PRINTTOFILE;
-
+_
-        case PrinterData.PAGE_RANGE: pd.Flags |= OS.PD_PAGENUMS; break;
-        case PrinterData.SELECTION: pd.Flags |= OS.PD_SELECTION; break;
@@ -336 +336 @@
-        data = new PrinterData(driver, device);
-        if ((pd.Flags & OS.PD_PAGENUMS) != 0) {
-
+_
-            data.startPage = pd.nFromPage & 0xFFFF;
-            data.endPage = pd.nToPage & 0xFFFF;
-        } else if ((pd.Flags & OS.PD_SELECTION) != 0) {
-
+_
-        }
-        data.printToFile = (pd.Flags & OS.PD_PRINTTOFILE) != 0;
@@ -357 +357 @@
-        endPage = data.endPage;
-        printToFile = data.printToFile;
-scope = data.
+_scope = data._
-        startPage = data.startPage;
-    }

trunk/current/win32/import/dwt/printing/printerdata.d

@@ -61 +61 @@
-     * </dl>
-     */
-
+_
-    
-    /**

trunk/current/win32/import/make-dwt-lib.bat

@@ -4 +4 @@
-
-@echo Build release version ...
--w
+
-
-@echo -----------------------------------------      
-@echo Build debug version ...
--w
+
-
-@echo -----------------------------------------