X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b044829c47beb6e37d510d17f917106f5c9b0f29..76e7cfab8fdb0c7862fd07e427af54181717fc62:/src/motif/combobox.cpp?ds=sidebyside diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp index 313dde7628..cf85010c4c 100644 --- a/src/motif/combobox.cpp +++ b/src/motif/combobox.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 17/09/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -38,8 +37,6 @@ void wxComboBoxCallback (Widget w, XtPointer clientData, XmComboBoxSelectionCallbackStruct * cbs); -IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) - bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, @@ -53,8 +50,6 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, return false; PreCreation(); - m_noStrings = n; - Widget parentWidget = (Widget) parent->GetClientWidget(); Widget buttonWidget = XtVaCreateManagedWidget(name.c_str(), @@ -72,7 +67,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, { wxXmString str( choices[i] ); XmComboBoxAddItem(buttonWidget, str(), 0); - m_stringList.Add(choices[i]); + m_stringArray.Add(choices[i]); } m_mainWidget = (Widget) buttonWidget; @@ -111,8 +106,6 @@ wxComboBox::~wxComboBox() DetachWidget((Widget) m_mainWidget); // Removes event handlers XtDestroyWidget((Widget) m_mainWidget); m_mainWidget = (WXWidget) 0; - if ( HasClientObjectData() ) - m_clientDataDict.DestroyData(); } void wxComboBox::DoSetSize(int x, int y, @@ -123,6 +116,8 @@ void wxComboBox::DoSetSize(int x, int y, wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags); } +#if 0 +// Already defined in include/motif/combobox.h wxString wxComboBox::GetValue() const { char *s = XmComboBoxGetString ((Widget) m_mainWidget); @@ -135,6 +130,7 @@ wxString wxComboBox::GetValue() const else return wxEmptyString; } +#endif void wxComboBox::SetValue(const wxString& value) { @@ -151,54 +147,39 @@ void wxComboBox::SetString(unsigned int WXUNUSED(n), const wxString& WXUNUSED(s) wxFAIL_MSG( wxT("wxComboBox::SetString only implemented for Motif 2.0") ); } -int wxComboBox::DoAppend(const wxString& item) -{ - wxXmString str( item.c_str() ); - XmComboBoxAddItem((Widget) m_mainWidget, str(), 0); - m_stringList.Add(item); - m_noStrings ++; - - return GetCount() - 1; -} - -int wxComboBox::DoInsert(const wxString& item, unsigned int pos) +// TODO auto-sorting is not supported by the code +int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, + wxClientDataType type) { - wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list")); - wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index")); + const unsigned int numItems = items.GetCount(); - if (pos == GetCount()) - return DoAppend(item); - - wxXmString str( item.c_str() ); - XmComboBoxAddItem((Widget) m_mainWidget, str(), pos+1); - wxChar* copy = wxStrcpy(new wxChar[item.length() + 1], item.c_str()); - m_stringList.Insert(pos, copy); - m_noStrings ++; + AllocClientData(numItems); + for( unsigned int i = 0; i < numItems; ++i, ++pos ) + { + wxXmString str( items[i].c_str() ); + XmComboBoxAddItem((Widget) m_mainWidget, str(), GetMotifPosition(pos)); + m_stringArray.Insert(items[i], pos); + InsertNewItemClientData(pos, clientData, i, type); + } - return pos; + return pos - 1; } -void wxComboBox::Delete(unsigned int n) +void wxComboBox::DoDeleteOneItem(unsigned int n) { XmComboBoxDeletePos((Widget) m_mainWidget, n+1); - wxStringList::Node *node = m_stringList.Item(n); - if (node) - { - delete[] node->GetData(); - delete node; - } - m_clientDataDict.Delete(n, HasClientObjectData()); - m_noStrings--; + m_stringArray.RemoveAt(n); + wxControlWithItems::DoDeleteOneItem(n); } void wxComboBox::Clear() { XmComboBoxDeleteAllItems((Widget) m_mainWidget); - m_stringList.Clear(); + m_stringArray.Clear(); - if ( HasClientObjectData() ) - m_clientDataDict.DestroyData(); - m_noStrings = 0; + wxControlWithItems::DoClear(); } void wxComboBox::SetSelection (int n) @@ -217,11 +198,7 @@ int wxComboBox::GetSelection (void) const wxString wxComboBox::GetString(unsigned int n) const { - wxStringList::Node *node = m_stringList.Item(n); - if (node) - return wxString(node->GetData ()); - else - return wxEmptyString; + return m_stringArray[n]; } int wxComboBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const @@ -244,68 +221,6 @@ int wxComboBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const return wxNOT_FOUND; } -// Clipboard operations -void wxComboBox::Copy() -{ - XmComboBoxCopy((Widget) m_mainWidget, CurrentTime); -} - -void wxComboBox::Cut() -{ - XmComboBoxCut((Widget) m_mainWidget, CurrentTime); -} - -void wxComboBox::Paste() -{ - XmComboBoxPaste((Widget) m_mainWidget); -} - -void wxComboBox::SetEditable(bool WXUNUSED(editable)) -{ - // TODO -} - -void wxComboBox::SetInsertionPoint(long pos) -{ - XmComboBoxSetInsertionPosition ((Widget) m_mainWidget, (XmTextPosition) pos); -} - -void wxComboBox::SetInsertionPointEnd() -{ - XmTextPosition pos = XmComboBoxGetLastPosition ((Widget) m_mainWidget); - XmComboBoxSetInsertionPosition ((Widget) m_mainWidget, (XmTextPosition) (pos + 1)); -} - -long wxComboBox::GetInsertionPoint() const -{ - return (long) XmComboBoxGetInsertionPosition ((Widget) m_mainWidget); -} - -wxTextPos wxComboBox::GetLastPosition() const -{ - return (wxTextPos) XmComboBoxGetLastPosition ((Widget) m_mainWidget); -} - -void wxComboBox::Replace(long from, long to, const wxString& value) -{ - XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from, - (XmTextPosition) to, - value.char_str()); -} - -void wxComboBox::Remove(long from, long to) -{ - XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to, - (Time) 0); - XmComboBoxRemove ((Widget) m_mainWidget); -} - -void wxComboBox::SetSelection(long from, long to) -{ - XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to, - (Time) 0); -} - void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, XmComboBoxSelectionCallbackStruct * cbs) { @@ -316,7 +231,7 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, case XmCR_SINGLE_SELECT: case XmCR_BROWSE_SELECT: { - wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED, + wxCommandEvent event (wxEVT_COMBOBOX, item->GetId()); event.SetInt(cbs->index - 1); event.SetString( item->GetString ( event.GetInt() ) ); @@ -331,7 +246,7 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, } case XmCR_VALUE_CHANGED: { - wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId()); + wxCommandEvent event (wxEVT_TEXT, item->GetId()); event.SetInt(-1); event.SetString( item->GetValue() ); event.SetExtraLong(true); @@ -374,6 +289,11 @@ wxSize wxComboBox::DoGetBestSize() const return wxWindow::DoGetBestSize(); } +WXWidget wxComboBox::GetTextWidget() const +{ + return (WXWidget)XmComboBoxGetEditWidget((Widget) m_mainWidget); +} + #endif // XmVersion < 2000 #endif // wxUSE_COMBOBOX