fixed problems with sometimes processing the events twice introduced in rev 1.170...

[wxWidgets.git] / src / generic / wizard.cpp

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index f73f67e9102c1c87be5712c9ceda682b44d94fd2..bc07fcce141b78b70e06ebf79bee12da65c7bb57 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        generic/wizard.cpp
+// Name:        src/generic/wizard.cpp

 // Purpose:     generic implementation of wxWizard class
 // Author:      Vadim Zeitlin
 // Modified by: Robert Cavanaugh
 // Purpose:     generic implementation of wxWizard class
 // Author:      Vadim Zeitlin
 // Modified by: Robert Cavanaugh


@@ -263,13 +263,6 @@ wxSize wxWizardSizer::SiblingSize(wxSizerItem *child)
 // generic wxWizard implementation
 // ----------------------------------------------------------------------------
 
 // generic wxWizard implementation
 // ----------------------------------------------------------------------------
 

-#if wxCHECK_VERSION(2, 7, 0)
-    #error "Fix wxGTK vs. wxMSW difference other way"
-#else
-    WX_DEFINE_ARRAY_PTR(wxWizard *, wxModelessWizards);
-    wxModelessWizards modelessWizards;
-#endif
-

 void wxWizard::Init()
 {
     m_posWizard = wxDefaultPosition;
 void wxWizard::Init()
 {
     m_posWizard = wxDefaultPosition;


@@ -281,7 +274,7 @@ void wxWizard::Init()
     m_calledSetBorder = false;
     m_border = 0;
     m_started = false;
     m_calledSetBorder = false;
     m_border = 0;
     m_started = false;

-    modelessWizards.Add(this);
+    m_wasModal = false;

 }
 
 bool wxWizard::Create(wxWindow *parent,
 }
 
 bool wxWizard::Create(wxWindow *parent,


@@ -396,7 +389,7 @@ void wxWizard::AddButtonRow(wxBoxSizer *mainColumn)
     // was created before the 'next' button.
 
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
     // was created before the 'next' button.
 
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);

-    int buttonStyle = isPda ? wxBU_EXACTFIT : 0;    
+    int buttonStyle = isPda ? wxBU_EXACTFIT : 0;

 
     wxBoxSizer *buttonRow = new wxBoxSizer(wxHORIZONTAL);
 #ifdef __WXMAC__
 
     wxBoxSizer *buttonRow = new wxBoxSizer(wxHORIZONTAL);
 #ifdef __WXMAC__


@@ -461,10 +454,10 @@ void wxWizard::DoCreateControls()
         return;
 
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
         return;
 
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);

-    
+

     // Horizontal stretching, and if not PDA, border all around
     int mainColumnSizerFlags = isPda ? wxEXPAND : wxALL|wxEXPAND ;
     // Horizontal stretching, and if not PDA, border all around
     int mainColumnSizerFlags = isPda ? wxEXPAND : wxALL|wxEXPAND ;

-    
+

     // wxWindow::SetSizer will be called at end
     wxBoxSizer *windowSizer = new wxBoxSizer(wxVERTICAL);
 
     // wxWindow::SetSizer will be called at end
     wxBoxSizer *windowSizer = new wxBoxSizer(wxVERTICAL);
 


@@ -477,10 +470,10 @@ void wxWizard::DoCreateControls()
     );
 
     AddBitmapRow(mainColumn);
     );
 
     AddBitmapRow(mainColumn);

-    
+

     if (!isPda)
         AddStaticLine(mainColumn);
     if (!isPda)
         AddStaticLine(mainColumn);

-    
+

     AddButtonRow(mainColumn);
 
     // wxWindow::SetSizer should be followed by wxWindow::Fit, but
     AddButtonRow(mainColumn);
 
     // wxWindow::SetSizer should be followed by wxWindow::Fit, but


@@ -497,7 +490,7 @@ void wxWizard::SetPageSize(const wxSize& size)
 void wxWizard::FinishLayout()
 {
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 void wxWizard::FinishLayout()
 {
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);

-    
+

     // Set to enable wxWizardSizer::GetMaxChildSize
     m_started = true;
 
     // Set to enable wxWizardSizer::GetMaxChildSize
     m_started = true;
 


@@ -664,7 +657,7 @@ bool wxWizard::RunWizard(wxWizardPage *firstPage)
     // can't return false here because there is no old page
     (void)ShowPage(firstPage, true /* forward */);
 
     // can't return false here because there is no old page
     (void)ShowPage(firstPage, true /* forward */);
 

-    modelessWizards.Remove(this);
+    m_wasModal = true;

 
     return ShowModal() == wxID_OK;
 }
 
     return ShowModal() == wxID_OK;
 }


@@ -706,7 +699,7 @@ wxSize wxWizard::GetManualPageSize() const
         DEFAULT_PAGE_WIDTH = wxSystemSettings::GetMetric(wxSYS_SCREEN_X) / 2;
         DEFAULT_PAGE_HEIGHT = wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) / 2;
     }
         DEFAULT_PAGE_WIDTH = wxSystemSettings::GetMetric(wxSYS_SCREEN_X) / 2;
         DEFAULT_PAGE_HEIGHT = wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) / 2;
     }

-    
+

     wxSize totalPageSize(DEFAULT_PAGE_WIDTH,DEFAULT_PAGE_HEIGHT);
 
     totalPageSize.IncTo(m_sizePage);
     wxSize totalPageSize(DEFAULT_PAGE_WIDTH,DEFAULT_PAGE_HEIGHT);
 
     totalPageSize.IncTo(m_sizePage);


@@ -808,37 +801,17 @@ void wxWizard::OnWizEvent(wxWizardEvent& event)
         }
     }
 
         }
     }
 

-    if ( ( modelessWizards.Index(this) != wxNOT_FOUND ) &&
+    if ( ( !m_wasModal ) &&

          event.IsAllowed() &&
          ( event.GetEventType() == wxEVT_WIZARD_FINISHED ||
            event.GetEventType() == wxEVT_WIZARD_CANCEL
          )
        )
     {
          event.IsAllowed() &&
          ( event.GetEventType() == wxEVT_WIZARD_FINISHED ||
            event.GetEventType() == wxEVT_WIZARD_CANCEL
          )
        )
     {

-        modelessWizards.Remove(this);

         Destroy();
     }
 }
 
         Destroy();
     }
 }
 

-// ----------------------------------------------------------------------------
-// our public interface
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_2
-
-/* static */
-wxWizard *wxWizardBase::Create(wxWindow *parent,
-                               int id,
-                               const wxString& title,
-                               const wxBitmap& bitmap,
-                               const wxPoint& pos,
-                               const wxSize& WXUNUSED(size))
-{
-    return new wxWizard(parent, id, title, bitmap, pos);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-

 // ----------------------------------------------------------------------------
 // wxWizardEvent
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWizardEvent
 // ----------------------------------------------------------------------------