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

ok, it does work - it's just that wxGTK doesn't

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-11-03 21:11:41 +00:00
parent d6c9c1b71e
commit 3d49ce4485
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/generic/choicdgg.h
View File

@@ -164,14 +164,13 @@ public:
wxArrayInt GetSelections() const { return m_selections; }
// implementation from now on
void OnOK(wxCommandEvent& event);
virtual bool TransferDataFromWindow();
protected:
wxArrayInt m_selections;
private:
DECLARE_DYNAMIC_CLASS(wxMultiChoiceDialog)
DECLARE_EVENT_TABLE()
};
// ----------------------------------------------------------------------------

6
samples/dialogs/dialogs.cpp
View File

@@ -365,12 +365,14 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
this);
if ( count )
{
wxLogMessage("You selected %u items:", count);
wxString msg;
msg.Printf("You selected %u items:\n", count);
for ( size_t n = 0; n < count; n++ )
{
wxLogMessage("\t%u: %u (%s)", n, selections[n],
msg += wxString::Format("\t%u: %u (%s)\n", n, selections[n],
choices[selections[n]].c_str());
}
wxLogMessage(msg);
}
//else: cancelled or nothing selected
}

10
src/generic/choicdgg.cpp
View File

@@ -436,10 +436,6 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
// wxMultiChoiceDialog
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxMultiChoiceDialog, wxDialog)
EVT_BUTTON(wxID_OK, wxMultiChoiceDialog::OnOK)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxMultiChoiceDialog, wxDialog)
bool wxMultiChoiceDialog::Create( wxWindow *parent,
@@ -453,7 +449,7 @@ bool wxMultiChoiceDialog::Create( wxWindow *parent,
if ( !wxAnyChoiceDialog::Create(parent, message, caption,
n, choices,
style, pos,
wxLB_ALWAYS_SB | wxLB_MULTIPLE) )
wxLB_ALWAYS_SB | wxLB_EXTENDED) )
return FALSE;
return TRUE;
@@ -468,7 +464,7 @@ void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
}
}
void wxMultiChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
bool wxMultiChoiceDialog::TransferDataFromWindow()
{
m_selections.Empty();
size_t count = m_listbox->GetCount();
@@ -478,5 +474,5 @@ void wxMultiChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
m_selections.Add(n);
}
EndModal(wxID_OK);
return TRUE;
}