Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxSingleChoiceDialog under wxMotif.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-12-19 09:56:03 +00:00
parent 76985f52b2
commit 643e16ac3b
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/choicdgg.cpp
View File

@@ -454,10 +454,7 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
{ {
m_selection = m_listbox->GetSelection(); m_selection = m_listbox->GetSelection();
m_stringSelection = m_listbox->GetStringSelection(); m_stringSelection = m_listbox->GetStringSelection();
// TODO!
#ifndef __WXMOTIF__
if ( m_listbox->HasClientUntypedData() ) if ( m_listbox->HasClientUntypedData() )
#endif
SetClientData(m_listbox->GetClientData(m_selection)); SetClientData(m_listbox->GetClientData(m_selection));
EndModal(wxID_OK); EndModal(wxID_OK);
} }
@@ -467,10 +464,7 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
m_selection = m_listbox->GetSelection(); m_selection = m_listbox->GetSelection();
m_stringSelection = m_listbox->GetStringSelection(); m_stringSelection = m_listbox->GetStringSelection();
// TODO!
#ifndef __WXMOTIF__
if ( m_listbox->HasClientUntypedData() ) if ( m_listbox->HasClientUntypedData() )
#endif
SetClientData(m_listbox->GetClientData(m_selection)); SetClientData(m_listbox->GetClientData(m_selection));
EndModal(wxID_OK); EndModal(wxID_OK);
@@ -510,11 +504,6 @@ void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
bool wxMultiChoiceDialog::TransferDataFromWindow() bool wxMultiChoiceDialog::TransferDataFromWindow()
{ {
// VZ: I hate to do it but I can't fix wxMotif right now (FIXME)
#ifdef __WXMOTIF__
#define IsSelected Selected
#endif
m_selections.Empty(); m_selections.Empty();
size_t count = m_listbox->GetCount(); size_t count = m_listbox->GetCount();
for ( size_t n = 0; n < count; n++ ) for ( size_t n = 0; n < count; n++ )