X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b527aac54a829ba2ad77d8fb8609cd54eb8ef5d7..169935ad4ed842421ef24470a06d1aa298f90fbe:/src/generic/prntdlgg.cpp diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp index 1ec3f4acc3..5a89abe6e5 100644 --- a/src/generic/prntdlgg.cpp +++ b/src/generic/prntdlgg.cpp @@ -22,8 +22,6 @@ #include "wx/defs.h" -#define WINDOWS_PRINTING (wxTheApp->GetPrintMode() == wxPRINT_WINDOWS) - #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dc.h" @@ -75,22 +73,12 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, wxPrintData* data): if ( data ) printData = *data; - int buttonWidth = 65; - int buttonHeight = 25; - int spacing = 5; - int yPos = 5; - int xPos = 5; - - wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(5, yPos), wxSize(buttonWidth, buttonHeight)); - (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(buttonWidth + 5 + spacing, yPos), wxSize(buttonWidth, buttonHeight)); - - setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup..."), wxPoint(buttonWidth*2 + 5 + 2*spacing, yPos), wxSize(buttonWidth, buttonHeight)); - - okButton->SetDefault(); - okButton->SetFocus(); - - yPos += 35; + (void)new wxStaticBox( this, -1, _( "Printer options" ), wxPoint( 5, 5), wxSize( 300, 60 ) ); + printToFileCheckBox = new wxCheckBox(this, wxPRINTID_PRINTTOFILE, _("Print to File"), wxPoint(20, 25) ); + + setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup..."), wxPoint(160, 25), wxSize(100, -1)); + wxString *choices = new wxString[2]; choices[0] = _("All"); choices[1] = _("Pages"); @@ -100,41 +88,30 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, wxPrintData* data): if(printData.GetFromPage() != 0) { rangeRadioBox = new wxRadioBox(this, wxPRINTID_RANGE, _("Print Range"), - wxPoint(5, yPos), wxSize(-1, -1), 2, choices, 2); + wxPoint(5, 80), wxSize(-1, -1), 2, choices, 1, wxRA_VERTICAL); rangeRadioBox->SetSelection(1); } - yPos += 60; - xPos = 5; - int staticWidth = 45; - int textWidth = 40; - spacing = 10; - if(printData.GetFromPage() != 0) { - (void) new wxStaticText(this, wxPRINTID_STATIC, _("From:"), wxPoint(xPos, yPos)); - xPos += staticWidth; + (void) new wxStaticText(this, wxPRINTID_STATIC, _("From:"), wxPoint(5, 135)); - fromText = new wxTextCtrl(this, wxPRINTID_FROM, "", wxPoint(xPos, yPos), wxSize(textWidth, -1)); - xPos += spacing + textWidth; + fromText = new wxTextCtrl(this, wxPRINTID_FROM, "", wxPoint(45, 130), wxSize(40, -1)); - (void) new wxStaticText(this, wxPRINTID_STATIC, _("To:"), wxPoint(xPos, yPos)); - xPos += staticWidth; + (void) new wxStaticText(this, wxPRINTID_STATIC, _("To:"), wxPoint(100, 135)); - toText = new wxTextCtrl(this, wxPRINTID_TO, "", wxPoint(xPos, yPos), wxSize(textWidth, -1)); - xPos += spacing + textWidth; + toText = new wxTextCtrl(this, wxPRINTID_TO, "", wxPoint(133, 130), wxSize(40, -1)); } - (void) new wxStaticText(this, wxPRINTID_STATIC, _("Copies:"), wxPoint(xPos, yPos)); - xPos += spacing + staticWidth; + (void) new wxStaticText(this, wxPRINTID_STATIC, _("Copies:"), wxPoint(200, 135)); - noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, "", wxPoint(xPos, yPos), wxSize(textWidth, -1)); + noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, "", wxPoint(252, 130), wxSize(40, -1)); - yPos += 30; - xPos = 5; - - printToFileCheckBox = new wxCheckBox(this, wxPRINTID_PRINTTOFILE, _("Print to File"), wxPoint(xPos, yPos)); + wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(40, 180), wxSize(100, -1)); + (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(180, 180), wxSize(100, -1)); + okButton->SetDefault(); + okButton->SetFocus(); Fit(); Centre(wxBOTH); @@ -179,14 +156,14 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { wxThePrintSetupData->SetPrinterMode(PS_FILE); - char *f = wxFileSelector(_("PostScript file"), - wxPathOnly(wxThePrintSetupData->GetPrinterFile()), - wxFileNameFromPath(wxThePrintSetupData->GetPrinterFile()), - "ps", "*.ps", 0, this); - if (f) - wxThePrintSetupData->SetPrinterFile(f); - else - return; + wxString f = wxFileSelector(_("PostScript file"), + wxPathOnly(wxThePrintSetupData->GetPrinterFile()), + wxFileNameFromPath(wxThePrintSetupData->GetPrinterFile()), + "ps", "*.ps", 0, this); + if ( f.IsEmpty() ) + return; + + wxThePrintSetupData->SetPrinterFile(f); } else wxThePrintSetupData->SetPrinterMode(PS_PRINTER); @@ -312,12 +289,18 @@ wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintSe choices[1] = _("Landscape"); orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"), - wxPoint(10, 80), wxSize(-1, -1), 2, choices, 2); + wxPoint(10, 80), wxSize(-1, -1), 2, choices, 1, wxRA_VERTICAL ); orientationRadioBox->SetSelection(0); (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Options"), wxPoint(10, 130), wxSize(200,50) ); + + int colourXPos = 145; + +#ifdef __WXMOTIF__ + colourXPos = 150; +#endif - colourCheckBox = new wxCheckBox(this, wxPRINTID_PRINTCOLOUR, _("Print in colour"), wxPoint(15, 145)); + colourCheckBox = new wxCheckBox(this, wxPRINTID_PRINTCOLOUR, _("Print in colour"), wxPoint(15, colourXPos)); (void) new wxStaticBox(this, wxPRINTID_STATIC, _("Print spooling"), wxPoint(230, 10), wxSize(200,170) ); @@ -330,8 +313,8 @@ wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintSe printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, "", wxPoint(260, 135), wxSize(150, -1)); - wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(240, 200), wxSize(100, -1)); - (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(360, 200), wxSize(100, -1)); + wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(80, 200), wxSize(100, -1)); + (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(270, 200), wxSize(100, -1)); okButton->SetDefault(); okButton->SetFocus(); @@ -388,6 +371,7 @@ bool wxGenericPrintSetupDialog::TransferDataFromWindow(void) if (!val.IsNull() && val != "") printData.SetPaperName((char *)(const char *)val); } + *wxThePrintSetupData = GetPrintData(); return TRUE; } @@ -410,7 +394,12 @@ wxChoice *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y) sel = i; } - wxChoice *choice = new wxChoice(this, wxPRINTID_PAPERSIZE, wxPoint(*x, *y), wxSize(170, -1), n, + int width = 170; +#ifdef __WXMOTIF__ + width = 150; +#endif + + wxChoice *choice = new wxChoice(this, wxPRINTID_PAPERSIZE, wxPoint(*x, *y), wxSize(width, -1), n, choices); delete[] choices; @@ -425,6 +414,22 @@ wxChoice *wxGenericPrintSetupDialog::CreatePaperTypeChoice(int *x, int *y) void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event)) { + // We no longer query GetPrintMode, so we can eliminate the need + // to call SetPrintMode. + // This has the limitation that we can't explicitly call the PostScript + // print setup dialog from the generic Page Setup dialog under Windows, + // but since this choice would only happen when trying to do PostScript + // printing under Windows (and only in 16-bit Windows which + // doesn't have a Windows-specific page setup dialog) it's worth it. + + wxPrintData data; + data.SetSetupDialog(TRUE); + wxPrintDialog *printDialog = new wxPrintDialog(this, & data); + printDialog->ShowModal(); + + printDialog->Destroy(); + +#if 0 if (wxTheApp->GetPrintMode() == wxPRINT_POSTSCRIPT) { wxGenericPrintSetupDialog *genericPrintSetupDialog = @@ -441,9 +446,11 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event)) wxPrintData data; data.SetSetupDialog(TRUE); wxPrintDialog printDialog(this, & data); - printDialog.Show(TRUE); + printDialog.ShowModal(); } #endif +#endif + // 0 } wxGenericPageSetupDialog::wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data): @@ -455,6 +462,10 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog(wxWindow *parent, wxPageSetup int buttonWidth = 75; int buttonHeight = 25; int spacing = 5; +#ifdef __WXMOTIF__ + spacing = 15; +#endif + int yPos = 5; int xPos = 5; @@ -475,6 +486,10 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog(wxWindow *parent, wxPageSetup xPos = 5; yPos += 35; +#ifdef __WXMOTIF__ + yPos += 10; +#endif + paperTypeChoice = CreatePaperTypeChoice(&xPos, &yPos); xPos = 5; @@ -490,6 +505,10 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog(wxWindow *parent, wxPageSetup yPos += 60; int staticWidth = 110; +#ifdef __WXMOTIF__ + staticWidth += 20; +#endif + int textWidth = 60; spacing = 10; @@ -584,6 +603,7 @@ bool wxGenericPageSetupDialog::TransferDataFromWindow(void) } } } + return TRUE; } @@ -618,4 +638,3 @@ wxChoice *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y) return choice; } -