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

use wxWindowDisabler instead of ShowModal() for showing the print preview frame (patch 832288)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-07-25 17:09:30 +00:00
parent 74c481d117
commit 7c9955536a
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/prntbase.h
View File

@ -212,6 +212,7 @@ protected:
wxPreviewCanvas* m_previewCanvas;
wxPreviewControlBar* m_controlBar;
wxPrintPreviewBase* m_printPreview;
wxWindowDisabler* m_windowDisabler;
private:
DECLARE_CLASS(wxPreviewFrame)

14
src/common/prntbase.cpp
View File

@ -544,6 +544,7 @@ wxFrame(parent, -1, title, pos, size, style, name)
m_printPreview = preview;
m_controlBar = NULL;
m_previewCanvas = NULL;
m_windowDisabler = NULL;
// Give the application icon
#ifdef __WXMSW__
@ -559,11 +560,8 @@ wxPreviewFrame::~wxPreviewFrame()
void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
// MakeModal doesn't work on wxMac, especially when there
// are multiple top-level windows.
#ifndef __WXMAC__
MakeModal(FALSE);
#endif
if (m_windowDisabler)
delete m_windowDisabler;
// Need to delete the printout and the print preview
wxPrintout *printout = m_printPreview->GetPrintout();
@ -598,11 +596,7 @@ void wxPreviewFrame::Initialize()
SetAutoLayout( TRUE );
SetSizer( item0 );
// MakeModal doesn't work on wxMac, especially when there
// are multiple top-level windows.
#ifndef __WXMAC__
MakeModal(TRUE);
#endif
m_windowDisabler = new wxWindowDisabler(this);
Layout();