Note: This website is archived. For up-to-date information about D projects and development, please visit wiki.dlang.org.

Changeset 101

Show
Ignore:
Timestamp:
04/13/06 23:19:14 (19 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:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    Revision 82 Revision 101
    292        startPage_var = 1; 292        startPage_var = 1; 
    293        endPage_var = Integer.MAX_VALUE; 293        endPage_var = Integer.MAX_VALUE; 
    294        if (data.scope == PrinterData.PAGE_RANGE) { 294        if (data._scope == PrinterData.PAGE_RANGE) { 
    295            startPage_var = data.startPage; 295            startPage_var = data.startPage; 
    296            endPage_var = data.endPage; 296            endPage_var = data.endPage; 
    … … 
    302        }  302        }  
    303        else  303        else  
    304        if (data.scope == PrinterData.SELECTION) { 304        if (data._scope == PrinterData.SELECTION) { 
    305            selection = parent.getSelectionRange(); 305            selection = parent.getSelectionRange(); 
    306        } 306        } 
    … … 
    530        } 530        } 
    531        PrinterData data = printer.getPrinterData(); 531        PrinterData data = printer.getPrinterData(); 
    532        if (data.scope == PrinterData.PAGE_RANGE) { 532        if (data._scope == PrinterData.PAGE_RANGE) { 
    533            startLine = (startPage_var - 1) * pageSize; 533            startLine = (startPage_var - 1) * pageSize; 
    534        }  534        }  
    535        else 535        else 
    536        if (data.scope == PrinterData.SELECTION) { 536        if (data._scope == PrinterData.SELECTION) { 
    537            startLine = content.getLineAtOffset(selection.x); 537            startLine = content.getLineAtOffset(selection.x); 
    538            if (selection.y > 0) { 538            if (selection.y > 0) { 

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

    Revision 82 Revision 101
    40 40 
    41 41 
    42    int scope = PrinterData.ALL_PAGES; 42    int _scope = PrinterData.ALL_PAGES; 
    43    int startPage = 1, endPage = 1; 43    int startPage = 1, endPage = 1; 
    44    boolean printToFile = false; 44    boolean printToFile = false; 
    … … 
    130 130 
    131/** 131/** 
    132 * Returns the print job scope that the user selected 132 * Returns the print job _scope that the user selected 
    133 * before pressing OK in the dialog. This will be one 133 * before pressing OK in the dialog. This will be one 
    134 * of the following values: 134 * of the following values: 
    … … 
    142 * </dl> 142 * </dl> 
    143 * 143 * 
    144 * @return the scope setting that the user selected 144 * @return the _scope setting that the user selected 
    145 */ 145 */ 
    146public int getScope() { 146public int getScope() { 
    147    return scope; 147    return _scope; 
    148} 148} 
    149 149 
    … … 
    163 * @param scope the scope setting when the dialog is opened 163 * @param scope the scope setting when the dialog is opened 
    164 */ 164 */ 
    165public void setScope(int scope) { 165public void setScope(int _scope) { 
    166    this.scope = scope; 166    this._scope = _scope; 
    167} 167} 
    168 168 
    … … 
    268     268     
    269    if (printToFile) pd.Flags |= OS.PD_PRINTTOFILE; 269    if (printToFile) pd.Flags |= OS.PD_PRINTTOFILE; 
    270    switch (scope) { 270    switch (_scope) { 
    271        case PrinterData.PAGE_RANGE: pd.Flags |= OS.PD_PAGENUMS; break; 271        case PrinterData.PAGE_RANGE: pd.Flags |= OS.PD_PAGENUMS; break; 
    272        case PrinterData.SELECTION: pd.Flags |= OS.PD_SELECTION; break; 272        case PrinterData.SELECTION: pd.Flags |= OS.PD_SELECTION; break; 
    … … 
    336        data = new PrinterData(driver, device); 336        data = new PrinterData(driver, device); 
    337        if ((pd.Flags & OS.PD_PAGENUMS) != 0) { 337        if ((pd.Flags & OS.PD_PAGENUMS) != 0) { 
    338            data.scope = PrinterData.PAGE_RANGE; 338            data._scope = PrinterData.PAGE_RANGE; 
    339            data.startPage = pd.nFromPage & 0xFFFF; 339            data.startPage = pd.nFromPage & 0xFFFF; 
    340            data.endPage = pd.nToPage & 0xFFFF; 340            data.endPage = pd.nToPage & 0xFFFF; 
    341        } else if ((pd.Flags & OS.PD_SELECTION) != 0) { 341        } else if ((pd.Flags & OS.PD_SELECTION) != 0) { 
    342            data.scope = PrinterData.SELECTION; 342            data._scope = PrinterData.SELECTION; 
    343        } 343        } 
    344        data.printToFile = (pd.Flags & OS.PD_PRINTTOFILE) != 0; 344        data.printToFile = (pd.Flags & OS.PD_PRINTTOFILE) != 0; 
    … … 
    357        endPage = data.endPage; 357        endPage = data.endPage; 
    358        printToFile = data.printToFile; 358        printToFile = data.printToFile; 
    359        scope = data.scope; 359        _scope = data._scope; 
    360        startPage = data.startPage; 360        startPage = data.startPage; 
    361    } 361    } 

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

    Revision 76 Revision 101
    61     * </dl> 61     * </dl> 
    62     */ 62     */ 
    63    public int scope = ALL_PAGES; 63    public int _scope = ALL_PAGES; 
    64     64     
    65    /** 65    /** 

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

    Revision 92 Revision 101
    4 4 
    5@echo Build release version ... 5@echo Build release version ... 
    6build -release -clean -inline -w -lib -full -allobj dwt\all.d -T..\lib\dwt.lib -version=OLE_COM -version=DRAG_DROP 6build -release -clean -inline -lib -full -allobj dwt\all.d -T..\lib\dwt.lib -version=OLE_COM -version=DRAG_DROP 
    7 7 
    8@echo -----------------------------------------       8@echo -----------------------------------------       
    9@echo Build debug version ... 9@echo Build debug version ... 
    10build -debug -g -unittest -clean -w -lib -full -allobj dwt\all.d -T..\lib\dwtd.lib  -version=OLE_COM -version=DRAG_DROP 10build -debug -g -unittest -clean -lib -full -allobj dwt\all.d -T..\lib\dwtd.lib  -version=OLE_COM -version=DRAG_DROP 
    11 11 
    12@echo ----------------------------------------- 12@echo -----------------------------------------