X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d194444a7ad0e058b445ff189419ffbfa47a6d0..ac0c512d865e6236fc81882cb84cc38d09f8f0ec:/src/motif/listbox.cpp?ds=sidebyside diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp index 07670065d8..3d138f6435 100644 --- a/src/motif/listbox.cpp +++ b/src/motif/listbox.cpp @@ -38,7 +38,7 @@ #endif #include "wx/motif/private.h" - IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) static void wxListBoxCallback(Widget w, XtPointer clientData, @@ -52,21 +52,23 @@ static void wxListBoxCallback(Widget w, class wxSizeKeeper { int m_x, m_y; - wxWindow* m_w; + int m_w, m_h; + wxWindow* m_wnd; public: wxSizeKeeper( wxWindow* w ) - : m_w( w ) + : m_wnd( w ) { - m_w->GetSize( &m_x, &m_y ); + m_wnd->GetSize( &m_w, &m_h ); + m_wnd->GetPosition( &m_x, &m_y ); } void Restore() { int x, y; - m_w->GetSize( &x, &y ); + m_wnd->GetSize( &x, &y ); if( x != m_x || y != m_y ) - m_w->SetSize( -1, -1, m_x, m_y ); + m_wnd->SetSize( m_x, m_y, m_w, m_h ); } }; @@ -91,9 +93,9 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, if( !wxControl::CreateControl( parent, id, pos, size, style, validator, name ) ) return false; + PreCreation(); m_noItems = (unsigned int)n; - m_backgroundColour = * wxWHITE; Widget parentWidget = (Widget) parent->GetClientWidget(); Display* dpy = XtDisplay(parentWidget); @@ -120,7 +122,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, Widget listWidget = XmCreateScrolledList(parentWidget, - wxConstCast(name.c_str(), char), args, count); + name.char_str(), args, count); m_mainWidget = (WXWidget) listWidget; @@ -149,11 +151,10 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, (XtCallbackProc) wxListBoxCallback, (XtPointer) this); + PostCreation(); AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, best.x, best.y); - ChangeBackgroundColour(); - return true; } @@ -170,12 +171,6 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, style, validator, name); } -wxListBox::~wxListBox() -{ - if( HasClientObjectData() ) - m_clientDataDict.DestroyData(); -} - void wxListBox::SetSelectionPolicy() { Widget listBox = (Widget)m_mainWidget; @@ -207,63 +202,16 @@ void wxListBox::DoSetFirstItem( int N ) XmListSetPos ((Widget) m_mainWidget, N + 1); } -void wxListBox::Delete(unsigned int n) +void wxListBox::DoDeleteOneItem(unsigned int n) { Widget listBox = (Widget) m_mainWidget; XmListDeletePos (listBox, n + 1); - m_clientDataDict.Delete(n, HasClientObjectData()); + wxListBoxBase::DoDeleteOneItem(n); m_noItems --; } -int wxListBox::DoAppend(const wxString& item) -{ - Widget listBox = (Widget) m_mainWidget; - - int n; - XtVaGetValues (listBox, XmNitemCount, &n, NULL); - wxXmString text( item ); - // XmListAddItem(listBox, text, n + 1); - XmListAddItemUnselected (listBox, text(), 0); - - // It seems that if the list is cleared, we must re-ask for - // selection policy!! - SetSelectionPolicy(); - - m_noItems ++; - - return GetCount() - 1; -} - -void wxListBox::DoSetItems(const wxArrayString& items, void** clientData) -{ - Widget listBox = (Widget) m_mainWidget; - - if( HasClientObjectData() ) - m_clientDataDict.DestroyData(); - - XmString *text = new XmString[items.GetCount()]; - unsigned int i; - for (i = 0; i < items.GetCount(); ++i) - text[i] = wxStringToXmString (items[i]); - - if ( clientData ) - for (i = 0; i < items.GetCount(); ++i) - m_clientDataDict.Set(i, (wxClientData*)clientData[i], false); - - 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!! - SetSelectionPolicy(); - - m_noItems = items.GetCount(); -} - int wxDoFindStringInList(Widget w, const wxString& s) { wxXmString str( s ); @@ -272,11 +220,10 @@ int wxDoFindStringInList(Widget w, const wxString& s) bool success = XmListGetMatchPos (w, str(), &positions, &no_positions); - if (success) + if (success && positions) { int pos = positions[0]; - if (positions) - XtFree ((char *) positions); + XtFree ((char *) positions); return pos - 1; } else @@ -290,20 +237,19 @@ int wxListBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const return wxDoFindStringInList( (Widget)m_mainWidget, s ); } -void wxListBox::Clear() +void wxListBox::DoClear() { - if (m_noItems <= 0) + if (!m_noItems) return; wxSizeKeeper sk( this ); Widget listBox = (Widget) m_mainWidget; XmListDeleteAllItems (listBox); - if( HasClientObjectData() ) - m_clientDataDict.DestroyData(); sk.Restore(); + wxListBoxBase::DoClear(); m_noItems = 0; } @@ -364,26 +310,6 @@ bool wxListBox::IsSelected(int N) const return false; } -void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) -{ - m_clientDataDict.Set(n, clientData, false); -} - -wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const -{ - return m_clientDataDict.Get(n); -} - -void *wxListBox::DoGetItemClientData(unsigned int n) const -{ - return (void*)m_clientDataDict.Get(n); -} - -void wxListBox::DoSetItemClientData(unsigned int n, void *Client_data) -{ - m_clientDataDict.Set(n, (wxClientData*)Client_data, false); -} - // Return number of selections and an array of selected integers int wxListBox::GetSelections(wxArrayInt& aSelections) const { @@ -456,36 +382,43 @@ wxString wxListBox::GetString(unsigned int n) const return wxDoGetStringInList( (Widget)m_mainWidget, n ); } -void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos) +int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items, + unsigned int pos, + void **clientData, wxClientDataType type) { Widget listBox = (Widget) m_mainWidget; - XmString *text = new XmString[items.GetCount()]; + const unsigned int numItems = items.GetCount(); + + XmString *text = new XmString[numItems]; unsigned int i; - // Steve Hammes: Motif 1.1 compatibility - // #if XmVersion > 1100 - // Corrected by Sergey Krasnov from Steve Hammes' code #if XmVersion > 1001 - for (i = 0; i < items.GetCount(); i++) + for (i = 0; i < numItems; i++) + { text[i] = wxStringToXmString(items[i]); - XmListAddItemsUnselected(listBox, text, items.GetCount(), pos+1); + } + XmListAddItemsUnselected(listBox, text, numItems, GetMotifPosition(pos)); + InsertNewItemsClientData(pos, numItems, clientData, type); #else - for (i = 0; i < items.GetCount(); i++) + AllocClientData(numItems); + + unsigned int idx = pos; + for ( i = 0; i < numItems; i++, idx++ ) { text[i] = wxStringToXmString(items[i]); - // Another Sergey correction - XmListAddItemUnselected(listBox, text[i], pos+i+1); + XmListAddItemUnselected(listBox, text[i], GetMotifPosition(idx)); + InsertNewItemClientData(idx, clientData, i, type); } #endif - for (i = 0; i < items.GetCount(); i++) + for (i = 0; i < numItems; i++) XmStringFree(text[i]); delete[] text; - // It seems that if the list is cleared, we must re-ask for - // selection policy!! + m_noItems += numItems; + SetSelectionPolicy(); - m_noItems += items.GetCount(); + return pos + numItems - 1; } void wxListBox::SetString(unsigned int n, const wxString& s)