From: Mattia Barbon Date: Wed, 31 Jul 2002 20:35:41 +0000 (+0000) Subject: Refactored wxListBox code so that it correctly implements X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ef41d80cdfa98391d8530c4b142c9816e0519e68?ds=inline Refactored wxListBox code so that it correctly implements wxControlWithItems, and removed some duplicated code. Implemented wxCheckListBox using the same technique as wxGTK. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/motif/checklst.h b/include/wx/motif/checklst.h index 3a0444f892..85d12339e6 100644 --- a/include/wx/motif/checklst.h +++ b/include/wx/motif/checklst.h @@ -19,7 +19,7 @@ #include "wx/listbox.h" -class wxCheckListBox : public wxListBox +class wxCheckListBox : public wxCheckListBoxBase { DECLARE_DYNAMIC_CLASS(wxCheckListBox) @@ -34,11 +34,29 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); + + bool Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, const wxString choices[] = NULL, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxListBoxNameStr); // items may be checked bool IsChecked(size_t uiIndex) const; void Check(size_t uiIndex, bool bCheck = TRUE); - + + // override base class functions + virtual int DoAppend(const wxString& item); + virtual int FindString(const wxString& s) const; + virtual void SetString(int n, const wxString& s); + virtual wxString GetString(int n) const; + + virtual void DoInsertItems(const wxArrayString& items, int pos); + virtual void DoSetItems(const wxArrayString& items, void **clientData); +private: + void DoToggleItem( int item, int x ); private: DECLARE_EVENT_TABLE() }; diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h index 1d19486a8a..506dfbf2c0 100644 --- a/include/wx/motif/listbox.h +++ b/include/wx/motif/listbox.h @@ -39,7 +39,7 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr): - m_clientDataList(wxKEY_INTEGER) + m_clientDataList(wxKEY_INTEGER) { Create(parent, id, pos, size, n, choices, style, validator, name); } @@ -54,57 +54,29 @@ public: ~wxListBox(); - // Virtual functions required by wxControlWithItems. - // They are not all implemented yet :-( + // implementation of wxControlWithItems virtual int GetCount() const; virtual int DoAppend(const wxString& item); + virtual void DoSetItemClientData(int n, void* clientData); // + virtual void* DoGetItemClientData(int n) const; // + virtual void DoSetItemClientObject(int n, wxClientData* clientData); // + virtual wxClientData* DoGetItemClientObject(int n) const; // + virtual int GetSelection() const; + virtual void Delete(int n); + virtual int FindString(const wxString& s) const; + virtual void Clear(); + virtual void SetString(int n, const wxString& s); + virtual wxString GetString(int n) const; + + // implementation of wxListBoxbase + virtual void SetSelection(int n, bool select = TRUE); virtual void DoInsertItems(const wxArrayString& items, int pos); virtual void DoSetItems(const wxArrayString& items, void **clientData); virtual void DoSetFirstItem(int n); - virtual void DoSetItemClientData(int n, void* clientData); - virtual void* DoGetItemClientData(int n) const; - virtual void DoSetItemClientObject(int n, wxClientData* clientData); - virtual wxClientData* DoGetItemClientObject(int n) const; - virtual void Select(int n); - - virtual void Append(const wxString& item); - virtual void Append(const wxString& item, void *clientData); - virtual void Set(int n, const wxString* choices, void **clientData = NULL); - void Set(const wxArrayString& items, void **clientData = NULL) - { DoSetItems(items, clientData); } - virtual int FindString(const wxString& s) const ; - virtual void Clear(); - virtual void SetSelection(int n, bool select = TRUE); - - virtual void Deselect(int n); - - // For single choice list item only - virtual int GetSelection() const ; - virtual void Delete(int n); - virtual void *GetClientData(int n) const ; - virtual void *GetClientData() { return wxWindow::GetClientData(); } - virtual void SetClientData(int n, void *clientData); - virtual void SetClientData( void *data ) { wxWindow::SetClientData(data); } - virtual void SetString(int n, const wxString& s); - - // For single or multiple choice list item virtual int GetSelections(wxArrayInt& aSelections) const; - virtual bool IsSelected(int n) const ; - virtual wxString GetString(int n) const ; - - // Set the specified item at the first visible item - // or scroll to max range. - virtual void SetFirstItem(int n) ; - virtual void SetFirstItem(const wxString& s) ; - - virtual void InsertItems(int nItems, const wxString items[], int pos); - void InsertItems(const wxArrayString& items, int pos) - { DoInsertItems(items, pos); } + virtual bool IsSelected(int n) const; - virtual wxString GetStringSelection() const ; - virtual bool SetStringSelection(const wxString& s, bool flag = TRUE); - virtual int Number() const ; - + // For single or multiple choice list item void Command(wxCommandEvent& event); // Implementation @@ -112,10 +84,12 @@ public: virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); WXWidget GetTopWidget() const; - + +#if wxUSE_CHECKLISTBOX + virtual void DoToggleItem(int item, int x) {}; +#endif protected: int m_noItems; - int m_selected; // List mapping positions->client data wxList m_clientDataList; diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp index 740a1ad14b..fc1a76f69c 100644 --- a/src/motif/checklst.cpp +++ b/src/motif/checklst.cpp @@ -39,8 +39,36 @@ END_EVENT_TABLE() // control creation // ---------------- +static const wxString prefixChecked = "[x] "; +static const wxString prefixUnchecked = "[ ] "; +static const char checkChar = 'x', uncheckChar = ' '; + +static inline const wxString& Prefix(bool checked) + { return checked ? prefixChecked : prefixUnchecked; } +static inline bool IsChecked(const wxString& s) + { wxASSERT(s.length() >=4); return s[1] == checkChar; } + +static void CopyStringsAddingPrefix(const wxArrayString& orig, + wxArrayString& copy) +{ + copy.Clear(); + + for(size_t i = 0; i < orig.GetCount(); ++i ) + copy[i] = Prefix(FALSE) + orig[i]; +} + +static wxString* CopyStringsAddingPrefix(size_t n, const wxString choices[]) +{ + wxString* copy = new wxString[n]; + + for(size_t i = 0; i < n; ++i ) + copy[i].Add( Prefix(FALSE) + choices[i] ); + + return copy; +} + // def ctor: use Create() to really create the control -wxCheckListBox::wxCheckListBox() : wxListBox() +wxCheckListBox::wxCheckListBox() : wxCheckListBoxBase() { } @@ -50,25 +78,104 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, int nStrings, const wxString choices[], long style, const wxValidator& val, const wxString& name) - : wxListBox() + : wxCheckListBoxBase() { - // TODO: you'll probably need a separate Create instead of using - // the wxListBox one as here. - Create(parent, id, pos, size, nStrings, choices, style|wxLB_OWNERDRAW, val, name); + Create(parent, id, pos, size, nStrings, choices, + style, val, name); } +bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, const wxString choices[] = NULL, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name) +{ + wxString* chs = CopyStringsAddingPrefix(n, choices); + bool retVal = wxListBox::Create(parent, id, pos, size, n, chs, + style, validator, name); + delete[] chs; + return retVal; +} + // check items // ----------- -bool wxCheckListBox::IsChecked(size_t WXUNUSED(uiIndex)) const +bool wxCheckListBox::IsChecked(size_t uiIndex) const +{ + return ::IsChecked(wxListBox::GetString(uiIndex)); +} + +void wxCheckListBox::Check(size_t uiIndex, bool bCheck) { - // TODO - return FALSE; + wxString label = wxListBox::GetString(uiIndex); + if(::IsChecked(label) == bCheck) return; + label[1u] = bCheck ? checkChar : uncheckChar; + wxListBox::SetString(uiIndex, label); } -void wxCheckListBox::Check(size_t WXUNUSED(uiIndex), bool WXUNUSED(bCheck)) +void wxCheckListBox::DoToggleItem( int n, int x ) { - // TODO + if( x < 23 ) + { + wxString label = wxListBox::GetString(n); + label[1u] = (!::IsChecked(label)) ? checkChar : uncheckChar; + wxListBox::SetString(n, label); + + wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId()); + if( HasClientObjectData() ) + event.SetClientObject( GetClientObject(n) ); + else if( HasClientUntypedData() ) + event.SetClientData( GetClientData(n) ); + event.m_commandInt = n; + event.m_extraLong = TRUE; + event.SetEventObject(this); + event.SetString( GetString( n ) ); + + GetEventHandler()->ProcessEvent(event); + } } +int wxCheckListBox::DoAppend(const wxString& item) +{ + return wxListBox::DoAppend( Prefix(FALSE) + item ); +} + +int wxCheckListBox::FindString(const wxString& s) const +{ + int n1 = wxListBox::FindString(Prefix(FALSE) + s); + int n2 = wxListBox::FindString(Prefix(TRUE) + s); + int min = wxMin(n1, n2), max = wxMax(n1, n2); + + // why this works: + // n1 == -1, n2 == -1 => return -1 OK + // n1 != -1 || n2 != -1 => min == -1 => return the other one + // both != -1 => return the first one. + if( min == -1 ) return max; + return min; +} + +void wxCheckListBox::SetString(int n, const wxString& s) +{ + wxListBox::SetString( n, Prefix(IsChecked(n)) + s ); +} +wxString wxCheckListBox::GetString(int n) const +{ + return wxListBox::GetString(n).substr(4); +} + +void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos) +{ + wxArrayString copy; + CopyStringsAddingPrefix(items, copy); + wxListBox::DoInsertItems(copy, pos); +} + +void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData) +{ + wxArrayString copy; + CopyStringsAddingPrefix(items, copy); + wxListBox::DoSetItems(copy, clientData); +} diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp index 3502c25afc..2107f2e894 100644 --- a/src/motif/listbox.cpp +++ b/src/motif/listbox.cpp @@ -39,10 +39,6 @@ static void wxListBoxCallback(Widget w, XtPointer clientData, XmListCallbackStruct * cbs); -static void wxListBoxDefaultActionProc(Widget list_w, - XtPointer client_data, - XmListCallbackStruct * cbs); - // ============================================================================ // list box control implementation // ============================================================================ @@ -51,7 +47,6 @@ static void wxListBoxDefaultActionProc(Widget list_w, wxListBox::wxListBox() : m_clientDataList(wxKEY_INTEGER) { m_noItems = 0; - m_selected = 0; } bool wxListBox::Create(wxWindow *parent, wxWindowID id, @@ -64,7 +59,6 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, { m_windowStyle = style; m_noItems = n; - m_selected = 0; // m_backgroundColour = parent->GetBackgroundColour(); m_backgroundColour = * wxWHITE; m_foregroundColour = parent->GetForegroundColour(); @@ -95,7 +89,8 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, else count = 2; - Widget listWidget = XmCreateScrolledList (parentWidget, (char*) (const char*) name, args, count); + Widget listWidget = XmCreateScrolledList(parentWidget, + (char*)name.c_str(), args, count); m_mainWidget = (WXWidget) listWidget; @@ -110,21 +105,29 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, if (height == -1) height = 80; - XtAddCallback (listWidget, XmNbrowseSelectionCallback, (XtCallbackProc) wxListBoxCallback, - (XtPointer) this); - XtAddCallback (listWidget, XmNextendedSelectionCallback, (XtCallbackProc) wxListBoxCallback, - (XtPointer) this); - XtAddCallback (listWidget, XmNmultipleSelectionCallback, (XtCallbackProc) wxListBoxCallback, - (XtPointer) this); - - XtAddCallback (listWidget, XmNdefaultActionCallback, (XtCallbackProc) wxListBoxDefaultActionProc, - (XtPointer) this); + XtAddCallback (listWidget, + XmNbrowseSelectionCallback, + (XtCallbackProc) wxListBoxCallback, + (XtPointer) this); + XtAddCallback (listWidget, + XmNextendedSelectionCallback, + (XtCallbackProc) wxListBoxCallback, + (XtPointer) this); + XtAddCallback (listWidget, + XmNmultipleSelectionCallback, + (XtCallbackProc) wxListBoxCallback, + (XtPointer) this); + XtAddCallback (listWidget, + XmNdefaultActionCallback, + (XtCallbackProc) wxListBoxCallback, + (XtPointer) this); m_font = parent->GetFont(); ChangeFont(FALSE); SetCanAddEventHandler(TRUE); - AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, width, height); + AttachWidget (parent, m_mainWidget, (WXWidget) NULL, + pos.x, pos.y, width, height); ChangeBackgroundColour(); @@ -135,7 +138,7 @@ wxListBox::~wxListBox() { } -void wxListBox::SetFirstItem(int N) +void wxListBox::DoSetFirstItem( int N ) { int count, length; @@ -150,14 +153,6 @@ void wxListBox::SetFirstItem(int N) XmListSetPos ((Widget) m_mainWidget, N + 1); } -void wxListBox::SetFirstItem(const wxString& s) -{ - int N = FindString (s); - - if (N >= 0) - SetFirstItem (N); -} - void wxListBox::Delete(int N) { int width1, height1; @@ -181,10 +176,13 @@ void wxListBox::Delete(int N) SetSize (-1, -1, width1, height1); // (JDH) need to add code here to take care of clientDataList - wxNode *node = m_clientDataList.Find((long)N); // get item from list - if (node) m_clientDataList.DeleteNode(node); // if existed then delete from list - node = m_clientDataList.First(); // we now have to adjust all keys that - while (node) // are >=N+1 + // get item from list + wxNode *node = m_clientDataList.Find((long)N); + // if existed then delete from list + if (node) m_clientDataList.DeleteNode(node); + // we now have to adjust all keys that are >=N+1 + node = m_clientDataList.First(); + while (node) { if (node->GetKeyInteger() >= (long)(N+1)) node->SetKeyInteger(node->GetKeyInteger() - 1); @@ -194,7 +192,7 @@ void wxListBox::Delete(int N) m_noItems --; } -void wxListBox::Append(const wxString& item) +int wxListBox::DoAppend(const wxString& item) { int width1, height1; int width2, height2; @@ -233,27 +231,36 @@ void wxListBox::Append(const wxString& item) if (width1 != width2 || height1 != height2) SetSize (-1, -1, width1, height1); m_noItems ++; + + return GetCount() - 1; } -void wxListBox::Append(const wxString& item, void *clientData) +void wxListBox::DoSetItems(const wxArrayString& items, void** clientData) { + m_clientDataList.Clear(); int width1, height1; int width2, height2; Widget listBox = (Widget) m_mainWidget; - GetSize (&width1, &height1); - Bool managed = XtIsManaged(listBox); + + bool managed = XtIsManaged(listBox); if (managed) XtUnmanageChild (listBox); + XmString *text = new XmString[items.GetCount()]; + size_t i; + for (i = 0; i < items.GetCount(); ++i) + text[i] = XmStringCreateSimple ((char*)items[i].c_str()); - int n; - XtVaGetValues (listBox, XmNitemCount, &n, NULL); - XmString text = XmStringCreateSimple ((char*) (const char*) item); - // XmListAddItem(listBox, text, n + 1); - XmListAddItemUnselected (listBox, text, 0); - XmStringFree (text); + if ( clientData ) + for (i = 0; i < items.GetCount(); ++i) + m_clientDataList.Append ((long) i, (wxObject *) clientData[i]); + + XmListAddItems (listBox, text, items.GetCount(), 0); + for (i = 0; i < items.GetCount(); i++) + XmStringFree (text[i]); + delete[] text; // It seems that if the list is cleared, we must re-ask for // selection policy!! @@ -267,76 +274,15 @@ void wxListBox::Append(const wxString& item, void *clientData) XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT); XtSetValues (listBox, args, 2); - m_clientDataList.Append ((long) n, (wxObject *) clientData); - if (managed) XtManageChild (listBox); GetSize (&width2, &height2); - // Correct for randomly resized listbox - bad boy, Motif! if (width1 != width2 || height1 != height2) SetSize (-1, -1, width1, height1); - m_noItems ++; -} - -void wxListBox::Set(int n, const wxString *choices, void** clientData) -{ - m_clientDataList.Clear(); - int width1, height1; - int width2, height2; - - Widget listBox = (Widget) m_mainWidget; - GetSize (&width1, &height1); - - bool managed = XtIsManaged(listBox); - - if (managed) - XtUnmanageChild (listBox); - /*** - for (int i=0; i 1100 // Corrected by Sergey Krasnov from Steve Hammes' code #if XmVersion > 1001 - for (i = 0; i < nItems; i++) - text[i] = XmStringCreateSimple((char*) (const char*) items[i]); - XmListAddItemsUnselected(listBox, text, nItems, pos+1); + for (i = 0; i < items.GetCount(); i++) + text[i] = XmStringCreateSimple((char*)items[i].c_str()); + XmListAddItemsUnselected(listBox, text, items.GetCount(), pos+1); #else - for (i = 0; i < nItems; i++) + for (i = 0; i < items.GetCount(); i++) { - text[i] = XmStringCreateSimple((char*) (const char*) items[i]); - // XmListAddItemUnselected(listBox, text[i], i); - XmListAddItemUnselected(listBox, text[i], pos+i+1); // Another Sergey correction + text[i] = XmStringCreateSimple((char*)items[i].c_str()); + // Another Sergey correction + XmListAddItemUnselected(listBox, text[i], pos+i+1); } #endif - for (i = 0; i < nItems; i++) + for (i = 0; i < items.GetCount(); i++) XmStringFree(text[i]); - delete[] text; // It seems that if the list is cleared, we must re-ask for @@ -596,7 +552,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos) if (width1 != width2 /*|| height1 != height2*/) SetSize(-1, -1, width1, height1); - m_noItems += nItems; + m_noItems += items.GetCount(); } void wxListBox::SetString(int N, const wxString& s) @@ -622,34 +578,6 @@ void wxListBox::SetString(int N, const wxString& s) SetSize (-1, -1, width1, height1); } -int wxListBox::Number () const -{ - return m_noItems; -} - -// For single selection items only -wxString wxListBox::GetStringSelection () const -{ - wxString res; - int sel = GetSelection(); - if (sel > -1) - res = GetString(sel); - - return res; -} - -bool wxListBox::SetStringSelection (const wxString& s, bool flag) -{ - int sel = FindString (s); - if (sel > -1) - { - SetSelection (sel, flag); - return TRUE; - } - else - return FALSE; -} - void wxListBox::Command (wxCommandEvent & event) { if (event.m_extraLong) @@ -665,76 +593,61 @@ void wxListBox::Command (wxCommandEvent & event) void wxListBoxCallback (Widget WXUNUSED(w), XtPointer clientData, XmListCallbackStruct * cbs) { - /* - if (cbs->reason == XmCR_EXTENDED_SELECT) - cout << "*** Extend select\n"; - else if (cbs->reason == XmCR_SINGLE_SELECT) - cout << "*** Single select\n"; - else if (cbs->reason == XmCR_MULTIPLE_SELECT) - cout << "*** Multiple select\n"; - else if (cbs->reason == XmCR_BROWSE_SELECT) - cout << "*** Browse select\n"; - - if (cbs->selection_type == XmMODIFICATION) - cout << "*** Modification\n"; - else if (cbs->selection_type == XmINITIAL) - cout << "*** Initial\n"; - else if (cbs->selection_type == XmADDITION) - cout << "*** Addition\n"; - */ - wxListBox *item = (wxListBox *) clientData; if (item->InSetValue()) return; - wxCommandEvent event (wxEVT_COMMAND_LISTBOX_SELECTED, item->GetId()); + wxEventType evtType; + + if( cbs->reason == XmCR_DEFAULT_ACTION ) + evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED; + else + evtType = wxEVT_COMMAND_LISTBOX_SELECTED; + + int n = cbs->item_position - 1; + wxCommandEvent event (evtType, item->GetId()); + if ( item->HasClientObjectData() ) + event.SetClientObject( item->GetClientObject(n) ); + else if ( item->HasClientUntypedData() ) + event.SetClientData( item->GetClientData(n) ); + event.m_commandInt = n; + event.m_extraLong = TRUE; + event.SetEventObject(item); + event.SetString( item->GetString( n ) ); + + int x = -1; + if( cbs->event->type == ButtonRelease ) + { + XButtonEvent* evt = (XButtonEvent*)cbs->event; + + x = evt->x; + } + switch (cbs->reason) { case XmCR_MULTIPLE_SELECT: case XmCR_BROWSE_SELECT: - { - event.m_clientData = item->GetClientData (cbs->item_position - 1); - event.m_commandInt = cbs->item_position - 1; - event.m_extraLong = TRUE; - event.SetEventObject(item); - item->ProcessCommand (event); - break; - } +#if wxUSE_CHECKLISTBOX + item->DoToggleItem( n, x ); +#endif + case XmCR_DEFAULT_ACTION: + item->GetEventHandler()->ProcessEvent(event); + break; case XmCR_EXTENDED_SELECT: + switch (cbs->selection_type) { - switch (cbs->selection_type) - { - case XmINITIAL: - case XmADDITION: - case XmMODIFICATION: - { - event.m_clientData = item->GetClientData (cbs->item_position - 1); - event.m_commandInt = cbs->item_position - 1; - event.m_extraLong = TRUE; - event.SetEventObject(item); - item->ProcessCommand (event); - break; - } - } + case XmINITIAL: + case XmADDITION: + case XmMODIFICATION: + item->DoToggleItem( n, x ); + item->GetEventHandler()->ProcessEvent(event); break; } + break; } } -/* Respond by getting the -* designated "default button" in the action area and activate it -* as if the user had selected it. -*/ -void wxListBoxDefaultActionProc (Widget WXUNUSED(list_w), XtPointer client_data, XmListCallbackStruct * WXUNUSED(cbs)) -{ - wxListBox *lbox = (wxListBox *) client_data; - - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, lbox->GetId()); - event.SetEventObject( lbox ); - lbox->GetEventHandler()->ProcessEvent(event) ; -} - WXWidget wxListBox::GetTopWidget() const { return (WXWidget) XtParent( (Widget) m_mainWidget ); @@ -795,71 +708,7 @@ void wxListBox::ChangeForegroundColour() */ } -// These implement functions needed by wxControlWithItems. -// Unfortunately, they're not all implemented yet. - int wxListBox::GetCount() const { - return Number(); -} - -int wxListBox::DoAppend(const wxString& item) -{ - Append(item, (void*) NULL); - return GetCount() - 1; -} - -// Just appends, doesn't yet insert -void wxListBox::DoInsertItems(const wxArrayString& items, int WXUNUSED(pos)) -{ - size_t nItems = items.GetCount(); - - for ( size_t n = 0; n < nItems; n++ ) - { - Append( items[n], (void*) NULL); - } -} - -void wxListBox::DoSetItems(const wxArrayString& items, void **clientData) -{ - size_t nItems = items.GetCount(); - wxString* strings = new wxString[nItems]; - - for ( size_t n = 0; n < nItems; n++ ) - { - strings[n] = items[n]; - } - Set(nItems, strings, clientData); - - delete[] strings; -} - -void wxListBox::DoSetFirstItem(int WXUNUSED(n)) -{ - wxFAIL_MSG( wxT("wxListBox::DoSetFirstItem not implemented") ); -} - -void wxListBox::DoSetItemClientData(int n, void* clientData) -{ - SetClientData(n, clientData); -} - -void* wxListBox::DoGetItemClientData(int n) const -{ - return GetClientData(n); -} - -void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData) -{ - DoSetItemClientData(n, (void*) clientData); -} - -wxClientData* wxListBox::DoGetItemClientObject(int n) const -{ - return (wxClientData*) DoGetItemClientData(n); -} - -void wxListBox::Select(int n) -{ - SetSelection(n, TRUE); + return m_noItems; }