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

1. sorted wxListBox and wxComboBox seem to work under wxGTK

Browse Source 
2. to support this, new class wxControlWithItems added (ctrlsub.h/cpp) and the
   controls sample modified to test it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-22 18:00:39 +00:00
parent 2ee3ee1bc8
commit 6c8a980fc4
28 changed files with 657 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/common/lboxcmn.cpp
View File

@@ -6,7 +6,7 @@
// Created: 22.10.99
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
// Licence: wxWindows licence
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
@@ -67,73 +67,27 @@ void wxListBoxBase::Set(int nItems, const wxString* items, void **clientData)
// selection
// ----------------------------------------------------------------------------
wxString wxListBoxBase::GetStringSelection () const
{
wxString s;
int sel = GetSelection();
if ( sel != -1 )
s = GetString(sel);
return s;
}
bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
{
int sel = FindString(s);
wxCHECK_MSG( sel != -1, FALSE,
wxT("invalid string in wxListBox::SetStringSelection") );
wxT("invalid string in SetStringSelection") );
SetSelection(sel, select);
return TRUE;
}
// ----------------------------------------------------------------------------
// client data
// ----------------------------------------------------------------------------
void wxListBoxBase::SetClientObject(int n, wxClientData *data)
{
wxASSERT_MSG( m_clientDataItemsType != ClientData_Void,
wxT("can't have both object and void client data") );
wxClientData *clientDataOld = DoGetClientObject(n);
if ( clientDataOld )
delete clientDataOld;
DoSetClientObject(n, data);
m_clientDataItemsType = ClientData_Object;
}
wxClientData *wxListBoxBase::GetClientObject(int n) const
{
wxASSERT_MSG( m_clientDataItemsType == ClientData_Object,
wxT("this window doesn't have object client data") );
return DoGetClientObject(n);
}
void wxListBoxBase::SetClientData(int n, void *data)
{
wxASSERT_MSG( m_clientDataItemsType != ClientData_Object,
wxT("can't have both object and void client data") );
DoSetClientData(n, data);
m_clientDataItemsType = ClientData_Void;
}
void *wxListBoxBase::GetClientData(int n) const
{
wxASSERT_MSG( m_clientDataItemsType == ClientData_Void,
wxT("this window doesn't have void client data") );
return DoGetClientData(n);
}
// ----------------------------------------------------------------------------
// misc
// ----------------------------------------------------------------------------
void wxListBoxBase::Command(wxCommandEvent& event)
{
SetSelection(event.m_commandInt, event.m_extraLong);
(void)ProcessEvent(event);
}
void wxListBoxBase::SetFirstItem(const wxString& s)
{
int n = FindString(s);
@@ -142,10 +96,3 @@ void wxListBoxBase::SetFirstItem(const wxString& s)
DoSetFirstItem(n);
}
void wxListBoxBase::Command(wxCommandEvent & event)
{
SetSelection(event.m_commandInt, event.m_extraLong);
(void)ProcessEvent(event);
}