From: Robert Roebling <robert@roebling.de>
Date: Sat, 12 Jan 2002 09:49:19 +0000 (+0000)
Subject: Corrected wxDialog event table under wxMac and wxOS2 as per the other ports.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d491523b1f5aef1081306d7e3002eb63b91c5cc9

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 ee65e02c47..706dfe892e 100644
--- 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 eed25f3fb7..755ad0192a 100644
--- 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 eed25f3fb7..755ad0192a 100644
--- 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 e503f93cc8..63f5abfe25 100644
--- 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)