Corrected wxDialog event table under wxMac and wxOS2 as per the other ports.
Corrected generic validator for wxComboBox as per bug report. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -442,7 +442,7 @@ bool wxGenericValidator::TransferFromWindow(void)
|
|||||||
}
|
}
|
||||||
else if (m_pString)
|
else if (m_pString)
|
||||||
{
|
{
|
||||||
*m_pString = pControl->GetStringSelection();
|
*m_pString = pControl->GetValue();
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
|
@@ -30,7 +30,7 @@ extern wxList wxPendingDelete;
|
|||||||
#if !USE_SHARED_LIBRARY
|
#if !USE_SHARED_LIBRARY
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
|
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow)
|
BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
|
||||||
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
|
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
|
||||||
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
|
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
|
||||||
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
|
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
|
||||||
|
@@ -30,7 +30,7 @@ extern wxList wxPendingDelete;
|
|||||||
#if !USE_SHARED_LIBRARY
|
#if !USE_SHARED_LIBRARY
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
|
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow)
|
BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
|
||||||
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
|
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
|
||||||
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
|
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
|
||||||
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
|
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
|
||||||
|
@@ -35,7 +35,7 @@ wxWindowList wxModalDialogs;
|
|||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
|
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow)
|
BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
|
||||||
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
|
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
|
||||||
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
|
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
|
||||||
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
|
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
|
||||||
|
Reference in New Issue
Block a user