X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaa6d89a0d0810b001a9217df913b9b74b883c8d..13b4df952c77383f50696e51fcbaa2d8bbd3b3b9:/src/motif/combobox_native.cpp?ds=sidebyside diff --git a/src/motif/combobox_native.cpp b/src/motif/combobox_native.cpp index 107df40f0b..9fbb5241a2 100644 --- a/src/motif/combobox_native.cpp +++ b/src/motif/combobox_native.cpp @@ -80,6 +80,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, { if( !CreateControl( parent, id, pos, size, style, validator, name ) ) return false; + PreCreation(); Widget parentWidget = (Widget) parent->GetClientWidget(); @@ -106,8 +107,6 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, SetValue(value); - ChangeFont(false); - XtAddCallback (buttonWidget, XmNselectionCallback, (XtCallbackProc) wxComboBoxCallback, (XtPointer) this); @@ -119,11 +118,10 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, if( size.x != wxDefaultCoord ) best.x = size.x; if( size.y != wxDefaultCoord ) best.y = size.y; + PostCreation(); AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, best.x, best.y); - ChangeBackgroundColour(); - return true; } @@ -163,8 +161,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, int width, int WXUNUSED(height), int sizeFlags) @@ -173,15 +169,6 @@ void wxComboBox::DoSetSize(int x, int y, int width, int WXUNUSED(height), int si wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags); } -wxString wxComboBox::GetValue() const -{ - char* s = XmTextGetString (GetXmText (this)); - wxString str(s); - if (s) - XtFree (s); - return str; -} - void wxComboBox::SetString(unsigned int n, const wxString& s) { wxXmString text(s); @@ -197,42 +184,35 @@ void wxComboBox::SetValue(const wxString& value) { m_inSetValue = true; - // Fix crash; probably an OpenMotif bug - const char* val = value.c_str() ? value.c_str() : ""; XtVaSetValues( GetXmText(this), - XmNvalue, wxConstCast(val, char), + XmNvalue, (const char*)value.mb_str(), NULL); m_inSetValue = false; } -int wxComboBox::DoAppend(const wxString& item) +int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items, + unsigned int pos, + void **clientData, wxClientDataType type) { - wxXmString str( item.c_str() ); - XmComboBoxAddItem((Widget) m_mainWidget, str(), 0, False); - m_noStrings ++; - AdjustDropDownListSize(); + const unsigned int numItems = items.GetCount(); - return GetCount() - 1; -} - -int wxComboBox::DoInsert(const wxString& item, unsigned int pos) -{ - wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list")); - wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index")); + AllocClientData(numItems); + for ( unsigned int i = 0; i < numItems; ++i, ++pos ) + { + wxXmString str( items[i].c_str() ); + XmComboBoxAddItem((Widget) m_mainWidget, str(), + GetMotifPosition(pos), False); - if (pos == GetCount()) - return DoAppend(item); + InsertNewItemClientData(pos, clientData, i, type); + } - wxXmString str( item.c_str() ); - XmComboBoxAddItem((Widget) m_mainWidget, str(), pos+1, False); - m_noStrings ++; AdjustDropDownListSize(); - return GetCount() - 1; + return pos - 1; } -void wxComboBox::Delete(unsigned int n) +void wxComboBox::DoDeleteOneItem(unsigned int n) { #ifdef LESSTIF_VERSION XmListDeletePos (GetXmList(this), n + 1); @@ -240,8 +220,8 @@ void wxComboBox::Delete(unsigned int n) XmComboBoxDeletePos((Widget) m_mainWidget, n+1); #endif - m_clientDataDict.Delete(n, HasClientObjectData()); - m_noStrings--; + wxControlWithItems::DoDeleteOneItem(n); + m_stringArray.RemoveAt(size_t(n)); AdjustDropDownListSize(); } @@ -251,16 +231,17 @@ void wxComboBox::Clear() #ifdef LESSTIF_VERSION XmListDeleteAllItems (GetXmList(this)); #else - while(m_noStrings > 0) + size_t n = m_stringArray.GetCount(); + while(n > 0) { - XmComboBoxDeletePos((Widget) m_mainWidget, m_noStrings--); + XmComboBoxDeletePos((Widget) m_mainWidget, n--); } #endif - if ( HasClientObjectData() ) - m_clientDataDict.DestroyData(); - m_noStrings = 0; + m_stringArray.Clear(); AdjustDropDownListSize(); + + wxTextEntry::Clear(); } void wxComboBox::SetSelection (int n) @@ -283,7 +264,7 @@ void wxComboBox::SetSelection (int n) m_inSetSelection = false; } -int wxComboBox::GetSelection (void) const +int wxComboBox::GetSelection() const { return wxDoGetSelectionInList( GetXmList( this ) ); } @@ -300,69 +281,6 @@ int wxComboBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const return wxDoFindStringInList( GetXmList( this ), s ); } -// Clipboard operations -void wxComboBox::Copy() -{ - XmTextCopy( GetXmText(this), CurrentTime ); -} - -void wxComboBox::Cut() -{ - XmTextCut( GetXmText(this), CurrentTime ); -} - -void wxComboBox::Paste() -{ - XmTextPaste( GetXmText(this) ); -} - -void wxComboBox::SetEditable(bool WXUNUSED(editable)) -{ - // TODO -} - -void wxComboBox::SetInsertionPoint(long pos) -{ - XmTextSetInsertionPosition( GetXmText(this), (XmTextPosition)pos ); -} - -void wxComboBox::SetInsertionPointEnd() -{ - SetInsertionPoint( GetLastPosition() ); -} - -long wxComboBox::GetInsertionPoint() const -{ - return (long)XmTextGetInsertionPosition( GetXmText(this) ); -} - -wxTextPos wxComboBox::GetLastPosition() const -{ - XmTextPosition pos = XmTextGetLastPosition( GetXmText(this) ); - return (long)pos; -} - -void wxComboBox::Replace(long from, long to, const wxString& value) -{ - XmTextReplace( GetXmText(this), (XmTextPosition)from, (XmTextPosition)to, - wxConstCast(value.c_str(), char) ); -} - -void wxComboBox::Remove(long from, long to) -{ - SetSelection( from, to ); - XmTextRemove( GetXmText(this) ); -} - -void wxComboBox::SetSelection(long from, long to) -{ - if( to == -1 ) - to = GetLastPosition(); - - XmTextSetSelection( GetXmText(this), (XmTextPosition)from, - (XmTextPosition)to, (Time)0 ); -} - void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, XmComboBoxCallbackStruct * cbs) { @@ -389,7 +307,7 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, event.SetClientData( item->GetClientData(idx) ); event.SetExtraLong(true); event.SetEventObject(item); - item->GetEventHandler()->ProcessEvent(event); + item->HandleWindowEvent(event); break; } case XmCR_VALUE_CHANGED: @@ -399,7 +317,7 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, event.SetString( item->GetValue() ); event.SetExtraLong(true); event.SetEventObject(item); - item->GetEventHandler()->ProcessEvent(event); + item->HandleWindowEvent(event); break; } default: @@ -409,7 +327,7 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, void wxComboBox::ChangeFont(bool keepOriginalSize) { - if( m_font.Ok() ) + if( m_font.IsOk() && m_mainWidget != NULL ) { wxDoChangeFont( GetXmText(this), m_font ); wxDoChangeFont( GetXmList(this), m_font ); @@ -458,6 +376,11 @@ wxSize wxComboBox::DoGetBestSize() const return wxWindow::DoGetBestSize(); } +WXWidget wxComboBox::GetTextWidget() const +{ + return (WXWidget)GetXmText(this); +} + #endif // XmVersion >= 2000 #endif // wxUSE_COMBOBOX