Forgot to commit these.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2004-11-07 10:20:14 +00:00
parent 0ab2de15cb
commit fe27303f7a
2 changed files with 5 additions and 3 deletions

View File

@ -46,7 +46,6 @@
#include "wx/thread.h"
#include "wx/utils.h"
#include "wx/ptr_scpd.h"
#include "wx/prntbase.h"
#if defined(__WXMSW__) && !defined(__PALMOS__)
#include "wx/msw/private.h" // includes windows.h for LOGFONT
@ -141,8 +140,6 @@ void wxAppBase::CleanUp()
delete wxTopLevelWindows.GetFirst()->GetData();
}
wxPrintFactory::SetPrintFactory( NULL );
// undo everything we did in Initialize() above
wxBitmap::CleanUpHandlers();

View File

@ -829,6 +829,10 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
TransferDataFromWindow();
// Transfer the current print settings from this dialog to the page setup dialog.
#if 0
// Use print factory later
wxPrintDialogData data;
data = GetPageSetupData().GetPrintData();
data.SetSetupDialog(true);
@ -842,6 +846,7 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
// Now update the dialog in case the page setup dialog changed some of our settings.
TransferDataToWindow();
#endif
}
wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,