X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c698eae5a875ca973df44add1ad67ec69a5754ba..cdc48273b49b0b90d9587a1ecc5935d38a160620:/src/motif/combobox.cpp diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp index 8600650432..83dac29f7f 100644 --- a/src/motif/combobox.cpp +++ b/src/motif/combobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox.cpp +// Name: src/motif/combobox.cpp // Purpose: wxComboBox class // Author: Julian Smart // Modified by: @@ -9,16 +9,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "combobox.h" -#endif - -#include "wx/setup.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_COMBOBOX #include "wx/combobox.h" +#ifndef WX_PRECOMP + #include "wx/arrstr.h" +#endif + #ifdef __VMS__ #pragma message disable nosimpint #endif @@ -49,9 +50,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& name) { if( !CreateControl( parent, id, pos, size, style, validator, name ) ) - return FALSE; - - m_noStrings = n; + return false; + PreCreation(); Widget parentWidget = (Widget) parent->GetClientWidget(); @@ -70,7 +70,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; @@ -79,18 +79,29 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, SetValue(value); - ChangeFont(FALSE); - XtAddCallback (buttonWidget, XmNselectionCallback, (XtCallbackProc) wxComboBoxCallback, (XtPointer) this); XtAddCallback (buttonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxComboBoxCallback, (XtPointer) this); + PostCreation(); AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); - ChangeBackgroundColour(); + return true; +} - return TRUE; +bool wxComboBox::Create(wxWindow *parent, wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name) +{ + wxCArrayString chs(choices); + return Create(parent, id, value, pos, size, chs.GetCount(), + chs.GetStrings(), style, validator, name); } wxComboBox::~wxComboBox() @@ -98,16 +109,18 @@ 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, int width, int height, int sizeFlags) +void wxComboBox::DoSetSize(int x, int y, + int width, int WXUNUSED(height), + int sizeFlags) { // Necessary so it doesn't call wxChoice::SetSize 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); @@ -120,71 +133,56 @@ wxString wxComboBox::GetValue() const else return wxEmptyString; } +#endif void wxComboBox::SetValue(const wxString& value) { - m_inSetValue = TRUE; if( !value.empty() ) - XmComboBoxSetString( (Widget)m_mainWidget, - wxConstCast(value.c_str(), char) ); - m_inSetValue = FALSE; + { + m_inSetValue = true; + XmComboBoxSetString((Widget)m_mainWidget, value.char_str()); + m_inSetValue = false; + } } -void wxComboBox::SetString(int n, const wxString& s) +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, 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((pos>=0) && (pos<=GetCount()), -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); -#ifndef __VMS - //FIX me for VMS : no intance for insert function to overload - m_stringList.Insert(pos, item); -#endif - 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(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) @@ -201,17 +199,15 @@ int wxComboBox::GetSelection (void) const return sel - 1; } -wxString wxComboBox::GetString(int n) 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) const +int wxComboBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const { + // FIXME: back to base class for not supported value of bCase + int *pos_list = NULL; int count = 0; wxXmString text( s ); @@ -225,69 +221,7 @@ int wxComboBox::FindString(const wxString& s) const return pos; } - return -1; -} - -// 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); -} - -long wxComboBox::GetLastPosition() const -{ - return (long) XmComboBoxGetLastPosition ((Widget) m_mainWidget); -} - -void wxComboBox::Replace(long from, long to, const wxString& value) -{ - XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from, - (XmTextPosition) to, - wxConstCast(value.c_str(), char)); -} - -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); + return wxNOT_FOUND; } void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, @@ -302,13 +236,13 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, { wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED, item->GetId()); - event.m_commandInt = cbs->index - 1; - event.m_commandString = item->GetString (event.m_commandInt); + event.SetInt(cbs->index - 1); + event.SetString( item->GetString ( event.GetInt() ) ); if ( item->HasClientObjectData() ) event.SetClientObject( item->GetClientObject(cbs->index - 1) ); else if ( item->HasClientUntypedData() ) event.SetClientData( item->GetClientData(cbs->index - 1) ); - event.m_extraLong = TRUE; + event.SetExtraLong(true); event.SetEventObject(item); item->ProcessCommand (event); break; @@ -316,9 +250,9 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, case XmCR_VALUE_CHANGED: { wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId()); - event.m_commandInt = -1; - event.m_commandString = item->GetValue(); - event.m_extraLong = TRUE; + event.SetInt(-1); + event.SetString( item->GetValue() ); + event.SetExtraLong(true); event.SetEventObject(item); item->ProcessCommand (event); break; @@ -358,6 +292,11 @@ wxSize wxComboBox::DoGetBestSize() const return wxWindow::DoGetBestSize(); } +WXWidget wxComboBox::GetTextWidget() const +{ + return (WXWidget)XmComboBoxGetEditWidget((Widget) m_mainWidget); +} + #endif // XmVersion < 2000 #endif // wxUSE_COMBOBOX