updated license info: Remstar gace permission to change it to wxWindows License with...

[wxWidgets.git] / src / common / prntbase.cpp

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 9c24e2d6867b0348eaab0882e9cb01c337673690..bb29c3e968d9eb0633cbf6db171fe534310bb25c 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -544,6 +544,7 @@ wxFrame(parent, -1, title, pos, size, style, name)
     m_printPreview = preview;
     m_controlBar = NULL;
     m_previewCanvas = NULL;
     m_printPreview = preview;
     m_controlBar = NULL;
     m_previewCanvas = NULL;

+    m_windowDisabler = NULL;

 
     // Give the application icon
 #ifdef __WXMSW__
 
     // Give the application icon
 #ifdef __WXMSW__


@@ -559,11 +560,8 @@ wxPreviewFrame::~wxPreviewFrame()
 
 void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
 
 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();
 
     // 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 );
 
     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();
 
 
     Layout();