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

[ 1495131 ] wxODComboBox const methods to work prior to SetPopupControl.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-14 19:32:32 +00:00
parent 3370ec75f4
commit 54a6176249
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/generic/odcombo.cpp
View File

@@ -710,25 +710,36 @@ void wxOwnerDrawnComboBox::Delete(unsigned int n)
unsigned int wxOwnerDrawnComboBox::GetCount() const unsigned int wxOwnerDrawnComboBox::GetCount() const
{ {
wxASSERT_MSG( m_popupInterface, wxT("no popup interface") ); if ( !m_popupInterface )
return m_initChs.GetCount();
return m_popupInterface->GetCount(); return m_popupInterface->GetCount();
} }
wxString wxOwnerDrawnComboBox::GetString(unsigned int n) const wxString wxOwnerDrawnComboBox::GetString(unsigned int n) const
{ {
wxCHECK_MSG( IsValid(n), wxEmptyString, _T("invalid index in wxOwnerDrawnComboBox::GetString") ); wxCHECK_MSG( IsValid(n), wxEmptyString, _T("invalid index in wxOwnerDrawnComboBox::GetString") );
if ( !m_popupInterface )
return m_initChs.Item(n);
return m_popupInterface->GetString(n); return m_popupInterface->GetString(n);
} }
void wxOwnerDrawnComboBox::SetString(unsigned int n, const wxString& s) void wxOwnerDrawnComboBox::SetString(unsigned int n, const wxString& s)
{ {
EnsurePopupControl();
wxCHECK_RET( IsValid(n), _T("invalid index in wxOwnerDrawnComboBox::SetString") ); wxCHECK_RET( IsValid(n), _T("invalid index in wxOwnerDrawnComboBox::SetString") );
m_popupInterface->SetString(n,s); m_popupInterface->SetString(n,s);
} }
int wxOwnerDrawnComboBox::FindString(const wxString& s, bool bCase) const int wxOwnerDrawnComboBox::FindString(const wxString& s, bool bCase) const
{ {
wxASSERT_MSG( m_popupInterface, wxT("no popup interface") ); if ( !m_popupInterface )
return m_initChs.Index(s, bCase);
return m_popupInterface->FindString(s, bCase); return m_popupInterface->FindString(s, bCase);
} }
@@ -755,7 +766,9 @@ void wxOwnerDrawnComboBox::Select(int n)
int wxOwnerDrawnComboBox::GetSelection() const int wxOwnerDrawnComboBox::GetSelection() const
{ {
wxASSERT_MSG( m_popupInterface, wxT("no popup interface") ); if ( !m_popupInterface )
return m_initChs.Index(m_valueString);
return m_popupInterface->GetSelection(); return m_popupInterface->GetSelection();
} }
@@ -786,7 +799,9 @@ void wxOwnerDrawnComboBox::DoSetItemClientData(unsigned int n, void* clientData)
void* wxOwnerDrawnComboBox::DoGetItemClientData(unsigned int n) const void* wxOwnerDrawnComboBox::DoGetItemClientData(unsigned int n) const
{ {
wxASSERT_MSG( m_popupInterface, wxT("no popup interface") ); if ( !m_popupInterface )
return NULL;
return m_popupInterface->GetItemClientData(n); return m_popupInterface->GetItemClientData(n);
} }