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

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index ee65e02c47fd54022d5b4d4ddaa30c5ce3c1ea16..706dfe892e7ed6d0f2f1ba2d0e7eafe4b01eeb06 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -442,7 +442,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     }
     else if (m_pString)
     {
-        *m_pString = pControl->GetStringSelection();
+        *m_pString = pControl->GetValue();
         return TRUE;
     }
   } else

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index eed25f3fb7bd6922eed982788497ecf962acf9f2..755ad0192ad4e19dde011648a22efd999218ba8c 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -30,7 +30,7 @@ extern wxList wxPendingDelete;
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
-BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow)
+BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
   EVT_BUTTON(wxID_OK, wxDialog::OnOK)
   EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
   EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)

diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index eed25f3fb7bd6922eed982788497ecf962acf9f2..755ad0192ad4e19dde011648a22efd999218ba8c 100644 (file)
--- a/src/mac/dialog.cpp
+++ b/src/mac/dialog.cpp
@@ -30,7 +30,7 @@ extern wxList wxPendingDelete;
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
-BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow)
+BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
   EVT_BUTTON(wxID_OK, wxDialog::OnOK)
   EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
   EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index e503f93cc89ee7337faad783be4682385f44a154..63f5abfe257dcd5e131c3fda925efc1072931d97 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -35,7 +35,7 @@ wxWindowList wxModalDialogs;
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
-BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow)
+BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
     EVT_BUTTON(wxID_OK, wxDialog::OnOK)
     EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
     EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)