Moved the wxPageSetupDialogData <-> native conversion
code for MSW to the appropriate file in src/msw/printdlg.cpp Removed the now obsolete printer setup dialog code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -837,11 +837,9 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
|
||||
|
||||
#if wxUSE_PRINTING_ARCHITECTURE
|
||||
EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
|
||||
EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPrintSetup)
|
||||
EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)
|
||||
|
||||
EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdatePrint)
|
||||
EVT_UPDATE_UI(wxID_PRINT_SETUP, wxDocManager::OnUpdatePrintSetup)
|
||||
EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview)
|
||||
#endif
|
||||
END_EVENT_TABLE()
|
||||
@@ -1005,22 +1003,6 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
|
||||
#endif // wxUSE_PRINTING_ARCHITECTURE
|
||||
}
|
||||
|
||||
void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
#if wxUSE_PRINTING_ARCHITECTURE
|
||||
wxWindow *parentWin = wxTheApp->GetTopWindow();
|
||||
wxView *view = GetCurrentView();
|
||||
if (view)
|
||||
parentWin = view->GetFrame();
|
||||
|
||||
wxPrintDialogData data;
|
||||
|
||||
wxPrintDialog printerDialog(parentWin, &data);
|
||||
printerDialog.GetPrintDialogData().SetSetupDialog(true);
|
||||
printerDialog.ShowModal();
|
||||
#endif // wxUSE_PRINTING_ARCHITECTURE
|
||||
}
|
||||
|
||||
void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
#if wxUSE_PRINTING_ARCHITECTURE
|
||||
@@ -1141,11 +1123,6 @@ void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)
|
||||
event.Enable( (doc != (wxDocument*) NULL) );
|
||||
}
|
||||
|
||||
void wxDocManager::OnUpdatePrintSetup(wxUpdateUIEvent& event)
|
||||
{
|
||||
event.Enable( true );
|
||||
}
|
||||
|
||||
void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event)
|
||||
{
|
||||
wxDocument *doc = GetCurrentDocument();
|
||||
|
Reference in New Issue
Block a user