wxListBox::~wxListBox()
{
-// DisposeExtLDEFInfo( m_macList ) ;
+ Free() ;
+ DisposeExtLDEFInfo( m_macList ) ;
}
-void wxListBox::SetFirstItem(int N)
+void wxListBox::Free()
{
- MacScrollTo( N ) ;
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ {
+ size_t uiCount = m_aItems.Count();
+ while ( uiCount-- != 0 ) {
+ delete m_aItems[uiCount];
+ }
+
+ m_aItems.Clear();
+ }
+ else
+#endif // wxUSE_OWNER_DRAWN
+ if ( HasClientObjectData() )
+ {
+ for ( size_t n = 0; n < (size_t)m_noItems; n++ )
+ {
+ delete GetClientObject(n);
+ }
+ }
}
-void wxListBox::SetFirstItem(const wxString& s)
+void wxListBox::DoSetFirstItem(int N)
{
- MacScrollTo( FindString( s ) ) ;
+ MacScrollTo( N ) ;
}
void wxListBox::Delete(int N)
{
- m_dataArray.Remove( N ) ;
+ wxCHECK_RET( N >= 0 && N < m_noItems,
+ wxT("invalid index in wxListBox::Delete") );
+
+#if wxUSE_OWNER_DRAWN
+ delete m_aItems[N];
+ m_aItems.Remove(N);
+#else // !wxUSE_OWNER_DRAWN
+ if ( HasClientObjectData() )
+ {
+ delete GetClientObject(N);
+ }
+#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
m_stringArray.Remove( N ) ;
m_noItems --;
MacDelete( N ) ;
}
-void wxListBox::Append(const wxString& item)
-{
- Append( item , NULL ) ;
-}
-
-void wxListBox::Append(const wxString& item, char *Client_data)
+int wxListBox::DoAppend(const wxString& item)
{
+ int index = m_noItems ;
if( wxApp::s_macDefaultEncodingIsPC )
{
m_stringArray.Add( wxMacMakeMacStringFromPC( item ) ) ;
}
else
m_stringArray.Add( item ) ;
- m_dataArray.Add( Client_data ) ;
- m_noItems ++;
-
+ m_noItems ++;
MacAppend( item ) ;
+
+ return index ;
}
-void wxListBox::Set(int n, const wxString *choices, char** clientData)
-{
+void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
+{
+ MacSetRedraw( false ) ;
Clear() ;
+ int n = choices.GetCount();
+
for( int i = 0 ; i < n ; ++i )
{
if ( clientData )
+ {
+#if wxUSE_OWNER_DRAWN
+ wxASSERT_MSG(clientData[i] == NULL,
+ wxT("Can't use client data with owner-drawn listboxes"));
+#else // !wxUSE_OWNER_DRAWN
Append( choices[i] , clientData[0] ) ;
+ #endif
+ }
else
Append( choices[i] ) ;
}
+
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW ) {
+ // first delete old items
+ size_t ui = m_aItems.Count();
+ while ( ui-- != 0 ) {
+ delete m_aItems[ui];
+ }
+ m_aItems.Empty();
+
+ // then create new ones
+ for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
+ wxOwnerDrawn *pNewItem = CreateItem(ui);
+ pNewItem->SetName(choices[ui]);
+ m_aItems.Add(pNewItem);
+ }
+ }
+#endif // wxUSE_OWNER_DRAWN
+ MacSetRedraw( true ) ;
+}
+
+bool wxListBox::HasMultipleSelection() const
+{
+ return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
}
int wxListBox::FindString(const wxString& st) const
void wxListBox::Clear()
{
+ Free();
m_noItems = 0;
m_stringArray.Empty() ;
m_dataArray.Empty() ;
MacSetSelection( N , select ) ;
}
-bool wxListBox::Selected(int N) const
+bool wxListBox::IsSelected(int N) const
{
wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
"invalid index in wxListBox::Selected" );
return MacIsSelected( N ) ;
}
-void wxListBox::Deselect(int N)
+void *wxListBox::DoGetItemClientData(int N) const
{
- wxCHECK_RET( N >= 0 && N < m_noItems,
- "invalid index in wxListBox::Deselect" );
+ wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
+ "invalid index in wxListBox::GetClientData" );
- SetSelection( N , false ) ;
+ return (void *)m_dataArray[N];
}
-char *wxListBox::GetClientData(int N) const
+wxClientData *wxListBox::DoGetItemClientObject(int N) const
{
- wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
- "invalid index in wxListBox::GetClientData" );
-
- return m_dataArray[N];
+ return (wxClientData *) DoGetItemClientData( N ) ;
}
-void wxListBox::SetClientData(int N, char *Client_data)
+void wxListBox::DoSetItemClientData(int N, void *Client_data)
{
wxCHECK_RET( N >= 0 && N < m_noItems,
"invalid index in wxListBox::SetClientData" );
- m_dataArray[N] = Client_data ;
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ {
+ // client data must be pointer to wxOwnerDrawn, otherwise we would crash
+ // in OnMeasure/OnDraw.
+ wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
+ }
+#endif // wxUSE_OWNER_DRAWN
+ m_dataArray[N] = (char*) Client_data ;
+}
+
+void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+{
+ DoSetItemClientData(n, clientData);
}
// Return number of selections and an array of selected integers
return m_stringArray[N] ;
}
-void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
{
+ wxCHECK_RET( pos >= 0 && pos <= m_noItems,
+ wxT("invalid index in wxListBox::InsertItems") );
+
+ int nItems = items.GetCount();
+
for ( int i = 0 ; i < nItems ; i++ )
{
m_stringArray.Insert( items[i] , pos + i ) ;
MacSet( N , s ) ;
}
-int wxListBox::Number () const
+wxSize wxListBox::DoGetBestSize()
{
- return m_noItems;
+ return wxSize(100, 100);
}
-// For single selection items only
-wxString wxListBox::GetStringSelection () const
+int wxListBox::GetCount() const
{
- int sel = GetSelection ();
- if (sel > -1)
- {
- return GetString (sel);
- }
- else
- return wxString("");
+ return m_noItems;
}
-bool wxListBox::SetStringSelection (const wxString& s, bool flag)
+void wxListBox::SetupColours()
{
- int sel = FindString (s);
- if (sel > -1)
- {
- SetSelection (sel, flag);
- return TRUE;
- }
- else
- return FALSE;
+ SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetForegroundColour(GetParent()->GetForegroundColour());
}
-void wxListBox::Command (wxCommandEvent & event)
+#if wxUSE_OWNER_DRAWN
+
+class wxListBoxItem : public wxOwnerDrawn
{
- if (event.m_extraLong)
- SetSelection (event.m_commandInt);
- else
- {
- Deselect (event.m_commandInt);
- return;
- }
- ProcessCommand (event);
+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
// ============================================================================
void wxListBox::MacDoClick()
{
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
+ event.SetEventObject( this );
+
wxArrayInt aSelections;
- int count = GetSelections(aSelections);
+ int n, count = GetSelections(aSelections);
if ( count > 0 )
{
- event.m_commandInt = aSelections[0] ;
- event.m_clientData = GetClientData(event.m_commandInt);
- wxString str(GetString(event.m_commandInt));
- if (str != "")
- event.m_commandString = copystring((char *)(const char *)str);
+ n = aSelections[0];
+ if ( HasClientObjectData() )
+ event.SetClientObject( GetClientObject(n) );
+ else if ( HasClientUntypedData() )
+ event.SetClientData( GetClientData(n) );
+ event.SetString( GetString(n) );
}
else
{
- return ;
- /*
- event.m_commandInt = -1 ;
- event.m_commandString = copystring("") ;
- */
+ n = -1;
}
- event.SetEventObject( this );
- ProcessCommand(event);
- if (event.m_commandString)
- delete[] event.m_commandString ;
+ event.m_commandInt = n;
+
+ GetEventHandler()->ProcessEvent(event);
}
void wxListBox::MacDoDoubleClick()
projects / wxWidgets.git / blobdiff