AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow printing objects to be passed a wxWindow, not a wxFrame

Browse Source 
(vestigial remains of older wxWin version)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2003-05-26 09:55:28 +00:00
parent 9f6df75d32
commit a5ae8241de
7 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/latex/wx/hteasypr.tex
View File

@ -28,16 +28,15 @@ this class stores various settings in it.
\membersection{wxHtmlEasyPrinting::wxHtmlEasyPrinting}\label{wxhtmleasyprintingwxhtmleasyprinting}
\func{}{wxHtmlEasyPrinting}{\param{const wxString\& }{name = "Printing"}, \param{wxFrame* }{parent\_frame = NULL}}
\func{}{wxHtmlEasyPrinting}{\param{const wxString\& }{name = "Printing"}, \param{wxWindow* }{parentWindow = NULL}}
Constructor.
\wxheading{Parameters}
\docparam{name}{Name of the printing. Used by preview frames and setup dialogs.}
\docparam{parent\_frame}{pointer to the frame that will own preview frame and setup dialogs. May be NULL.}
\docparam{name}{Name of the printing object. Used by preview frames and setup dialogs.}
\docparam{parentWindow}{pointer to the window that will own the preview frame and setup dialogs. May be NULL.}
\membersection{wxHtmlEasyPrinting::PreviewFile}\label{wxhtmleasyprintingpreviewfile}

2
docs/latex/wx/prevwin.tex
View File

@ -141,7 +141,7 @@ class may be used without derivation.
\membersection{wxPreviewFrame::wxPreviewFrame}
\func{}{wxPreviewFrame}{\param{wxPrintPreview* }{preview}, \param{wxFrame* }{parent}, \param{const wxString\& }{title},
\func{}{wxPreviewFrame}{\param{wxPrintPreview* }{preview}, \param{wxWindow* }{parent}, \param{const wxString\& }{title},
\param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& size }{size = wxDefaultSize},
\param{long}{ style = wxDEFAULT\_FRAME\_STYLE}, \param{const wxString\& }{name = ``frame"}}

7
docs/toback24.txt
View File

@ -166,13 +166,6 @@ Checking in include/wx/textbuf.h;
/pack/cvsroots/wxwindows/wxWindows/include/wx/textbuf.h,v <-- textbuf.h
new revision: 1.8; previous revision: 1.7
18. Better notebook page sizing
nbbase.cpp, CalcSizeFromPage, plus #includes at top of file.
This gets the tab size and adds a bit for borders.
We should do the same for other platforms, only rationalise
it so that wxNotebook returns the tab rect info.
19. Add wxFileConfig bug fix, marked by <JACS>...</JACS> in Parse().
This prevents mungeing of the config file after reading in
entries (say, just one entry in one group), then adding entries

4
include/wx/html/htmprint.h
View File

@ -196,7 +196,7 @@ private:
class WXDLLEXPORT wxHtmlEasyPrinting : public wxObject
{
public:
wxHtmlEasyPrinting(const wxString& name = wxT("Printing"), wxFrame *parent_frame = NULL);
wxHtmlEasyPrinting(const wxString& name = wxT("Printing"), wxWindow *parentWindow = NULL);
~wxHtmlEasyPrinting();
bool PreviewFile(const wxString &htmlfile);
@ -244,7 +244,7 @@ private:
int *m_FontsSizes;
wxString m_FontFaceFixed, m_FontFaceNormal;
wxString m_Headers[2], m_Footers[2];
wxFrame *m_Frame;
wxWindow *m_ParentWindow;
DECLARE_NO_COPY_CLASS(wxHtmlEasyPrinting)
};

2
include/wx/prntbase.h
View File

@ -192,7 +192,7 @@ class WXDLLEXPORT wxPreviewFrame: public wxFrame
{
public:
wxPreviewFrame(wxPrintPreviewBase *preview,
wxFrame *parent,
wxWindow *parent,
const wxString& title = wxT("Print Preview"),
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,

4
src/common/prntbase.cpp
View File

@ -503,7 +503,7 @@ BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
END_EVENT_TABLE()
wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxFrame *parent, const wxString& title,
wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxWindow *parent, const wxString& title,
const wxPoint& pos, const wxSize& size, long style, const wxString& name):
wxFrame(parent, -1, title, pos, size, style, name)
{
@ -511,7 +511,7 @@ wxFrame(parent, -1, title, pos, size, style, name)
m_controlBar = NULL;
m_previewCanvas = NULL;
// Looks silly on Windows with a standard Windows icon
// Give the application icon
#ifdef __WXMSW__
wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
if (topFrame)

12
src/html/htmprint.cpp
View File

@ -430,9 +430,9 @@ void wxHtmlPrintout::SetFonts(wxString normal_face, wxString fixed_face,
//----------------------------------------------------------------------------
wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxFrame *parent_frame)
wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxWindow *parentWindow)
{
m_Frame = parent_frame;
m_ParentWindow = parentWindow;
m_Name = name;
m_PrintData = new wxPrintData;
m_PageSetupData = new wxPageSetupDialogData;
@ -510,7 +510,7 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr
return FALSE;
}
wxPreviewFrame *frame = new wxPreviewFrame(preview, m_Frame,
wxPreviewFrame *frame = new wxPreviewFrame(preview, m_ParentWindow,
m_Name + _(" Preview"),
wxPoint(100, 100), wxSize(650, 500));
frame->Centre(wxBOTH);
@ -526,7 +526,7 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
wxPrintDialogData printDialogData(*m_PrintData);
wxPrinter printer(&printDialogData);
if (!printer.Print(m_Frame, printout, TRUE))
if (!printer.Print(m_ParentWindow, printout, TRUE))
{
return FALSE;
}
@ -540,7 +540,7 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
void wxHtmlEasyPrinting::PrinterSetup()
{
wxPrintDialogData printDialogData(*m_PrintData);
wxPrintDialog printerDialog(m_Frame, &printDialogData);
wxPrintDialog printerDialog(m_ParentWindow, &printDialogData);
printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
@ -559,7 +559,7 @@ void wxHtmlEasyPrinting::PageSetup()
}
m_PageSetupData->SetPrintData(*m_PrintData);
wxPageSetupDialog pageSetupDialog(m_Frame, m_PageSetupData);
wxPageSetupDialog pageSetupDialog(m_ParentWindow, m_PageSetupData);
if (pageSetupDialog.ShowModal() == wxID_OK)
{