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

fixed propagating of EVT_WIZARD_XXX events to the parent

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-05-22 23:36:20 +00:00
parent 39d16996b7
commit 91c68292f6
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/generic/wizard.h
View File

@ -13,8 +13,13 @@
// wxWizard // wxWizard
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef __GNUG__
#pragma interface "wizardg.h"
#endif
class WXDLLEXPORT wxButton; class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxStaticBitmap; class WXDLLEXPORT wxStaticBitmap;
class WXDLLEXPORT wxWizardEvent;
class WXDLLEXPORT wxWizard : public wxWizardBase class WXDLLEXPORT wxWizard : public wxWizardBase
{ {
@ -67,6 +72,8 @@ private:
void OnBackOrNext(wxCommandEvent& event); void OnBackOrNext(wxCommandEvent& event);
void OnHelp(wxCommandEvent& event); void OnHelp(wxCommandEvent& event);
void OnWizEvent(wxWizardEvent& event);
// the page size requested by user // the page size requested by user
wxSize m_sizePage; wxSize m_sizePage;

28
src/generic/wizard.cpp
View File

@ -21,7 +21,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation ".h" #pragma implementation "wizardg.h"
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
@ -64,6 +64,11 @@ BEGIN_EVENT_TABLE(wxWizard, wxDialog)
EVT_BUTTON(wxID_BACKWARD, wxWizard::OnBackOrNext) EVT_BUTTON(wxID_BACKWARD, wxWizard::OnBackOrNext)
EVT_BUTTON(wxID_FORWARD, wxWizard::OnBackOrNext) EVT_BUTTON(wxID_FORWARD, wxWizard::OnBackOrNext)
EVT_BUTTON(wxID_HELP, wxWizard::OnHelp) EVT_BUTTON(wxID_HELP, wxWizard::OnHelp)
EVT_WIZARD_PAGE_CHANGED(-1, wxWizard::OnWizEvent)
EVT_WIZARD_PAGE_CHANGING(-1, wxWizard::OnWizEvent)
EVT_WIZARD_CANCEL(-1, wxWizard::OnWizEvent)
EVT_WIZARD_HELP(-1, wxWizard::OnWizEvent)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog) IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog)
@ -90,7 +95,7 @@ wxWizardPage::wxWizardPage(wxWizard *parent,
{ {
Create(parent, bitmap, resource); Create(parent, bitmap, resource);
} }
bool wxWizardPage::Create(wxWizard *parent, bool wxWizardPage::Create(wxWizard *parent,
const wxBitmap& bitmap, const wxBitmap& bitmap,
const wxChar *resource) const wxChar *resource)
@ -112,7 +117,7 @@ bool wxWizardPage::Create(wxWizard *parent,
// initially the page is hidden, it's shown only when it becomes current // initially the page is hidden, it's shown only when it becomes current
Hide(); Hide();
return TRUE; return TRUE;
} }
@ -465,6 +470,23 @@ void wxWizard::OnHelp(wxCommandEvent& WXUNUSED(event))
} }
} }
void wxWizard::OnWizEvent(wxWizardEvent& event)
{
// the dialogs have wxWS_EX_BLOCK_EVENTS style on by default but we want to
// propagate wxEVT_WIZARD_XXX to the parent (if any), so do it manually
if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) )
{
// the event will be propagated anyhow
return;
}
wxWindow *parent = GetParent();
if ( !parent || !parent->GetEventHandler()->ProcessEvent(event) )
{
event.Skip();
}
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// our public interface // our public interface