Change to wxMenuBar::Remove(),

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

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 8b7e5bc941732278d004b67756d4ca1004ad2b24..a0636f159b306fa91aeecbf263c0785c3074f1ca 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -233,8 +233,6 @@ bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent),
                                    const wxPoint& WXUNUSED(pos) )
 {
     m_selection = 0;
-    m_clientData = NULL;
-    m_stringSelection = wxT("");
 
     m_dialogStyle = style;
 
@@ -290,8 +288,11 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
     m_selection = m_listbox->GetSelection();
     m_stringSelection = m_listbox->GetStringSelection();
-    m_clientData = m_listbox->GetClientData(m_selection);
-
+    // TODO!
+#ifndef __WXMOTIF__
+    if ( m_listbox->HasClientUntypedData() )
+        SetClientData(m_listbox->GetClientData(m_selection));
+#endif
     EndModal(wxID_OK);
 }
 
@@ -299,7 +300,12 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
 {
     m_selection = m_listbox->GetSelection();
     m_stringSelection = m_listbox->GetStringSelection();
-    m_clientData = m_listbox->GetClientData(m_selection);
+
+    // TODO!
+#ifndef __WXMOTIF__
+    if ( m_listbox->HasClientUntypedData() )
+        SetClientData(m_listbox->GetClientData(m_selection));
+#endif
 
     EndModal(wxID_OK);
 }