wxMac (debug) builds and runs wxMinimal again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -156,7 +156,6 @@ void wxListBox::Delete(int N)
|
||||
m_noItems --;
|
||||
|
||||
MacDelete( N ) ;
|
||||
SetHorizontalExtent("");
|
||||
}
|
||||
|
||||
int wxListBox::DoAppend(const wxString& item)
|
||||
@@ -171,8 +170,6 @@ int wxListBox::DoAppend(const wxString& item)
|
||||
m_noItems ++;
|
||||
MacAppend( item ) ;
|
||||
|
||||
SetHorizontalExtent(item);
|
||||
|
||||
return index ;
|
||||
}
|
||||
|
||||
@@ -260,7 +257,6 @@ void wxListBox::Clear()
|
||||
m_stringArray.Empty() ;
|
||||
m_dataArray.Empty() ;
|
||||
MacClear() ;
|
||||
SetHorizontalExtent();
|
||||
}
|
||||
|
||||
void wxListBox::SetSelection(int N, bool select)
|
||||
@@ -286,6 +282,11 @@ void *wxListBox::DoGetItemClientData(int N) const
|
||||
return (void *)m_dataArray[N];
|
||||
}
|
||||
|
||||
wxClientData *wxListBox::DoGetItemClientObject(int N) const
|
||||
{
|
||||
return (wxClientData *) DoGetItemClientData( N ) ;
|
||||
}
|
||||
|
||||
void wxListBox::DoSetItemClientData(int N, void *Client_data)
|
||||
{
|
||||
wxCHECK_RET( N >= 0 && N < m_noItems,
|
||||
@@ -375,6 +376,37 @@ wxSize wxListBox::DoGetBestSize()
|
||||
return wxSize(100, 100);
|
||||
}
|
||||
|
||||
int wxListBox::GetCount() const
|
||||
{
|
||||
return m_noItems;
|
||||
}
|
||||
|
||||
void wxListBox::SetupColours()
|
||||
{
|
||||
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
|
||||
SetForegroundColour(GetParent()->GetForegroundColour());
|
||||
}
|
||||
|
||||
#if wxUSE_OWNER_DRAWN
|
||||
|
||||
class wxListBoxItem : public wxOwnerDrawn
|
||||
{
|
||||
public:
|
||||
wxListBoxItem(const wxString& str = "");
|
||||
};
|
||||
|
||||
wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
|
||||
{
|
||||
// no bitmaps/checkmarks
|
||||
SetMarginWidth(0);
|
||||
}
|
||||
|
||||
wxOwnerDrawn *wxListBox::CreateItem(size_t n)
|
||||
{
|
||||
return new wxListBoxItem();
|
||||
}
|
||||
|
||||
#endif //USE_OWNER_DRAWN
|
||||
|
||||
// ============================================================================
|
||||
// list box control implementation
|
||||
|
Reference in New Issue
Block a user