X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/243dbf1a5088be31980df51b97831b52cb6986cd..ed7ec76de3e7dc4ccd0271d14b37e1017cad0db9:/src/motif/combobox_native.cpp diff --git a/src/motif/combobox_native.cpp b/src/motif/combobox_native.cpp index 9e1eec75f9..af01743d78 100644 --- a/src/motif/combobox_native.cpp +++ b/src/motif/combobox_native.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox_native.cpp +// Name: src/motif/combobox_native.cpp // Purpose: wxComboBox class // Author: Julian Smart, Ian Brown // Modified by: @@ -9,12 +9,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#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 @@ -75,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(); @@ -88,7 +94,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, Widget buttonWidget= XtVaCreateManagedWidget(name.c_str(), xmComboBoxWidgetClass, parentWidget, - XmNcomboBoxType, cb_type, + XmNcomboBoxType, cb_type, NULL); m_mainWidget = (Widget) buttonWidget; @@ -101,8 +107,6 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, SetValue(value); - ChangeFont(false); - XtAddCallback (buttonWidget, XmNselectionCallback, (XtCallbackProc) wxComboBoxCallback, (XtPointer) this); @@ -111,17 +115,30 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, (XtPointer) this); wxSize best = GetBestSize(); - if( size.x != -1 ) best.x = size.x; - if( size.y != -1 ) best.y = size.y; + 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; } +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); +} + void wxComboBox::AdjustDropDownListSize() { int newListCount = -1, itemCount = GetCount(); @@ -144,26 +161,15 @@ 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); } -wxString wxComboBox::GetValue() const -{ - char* s = XmTextGetString (GetXmText (this)); - wxString str(s); - if (s) - XtFree (s); - return str; -} - -void wxComboBox::SetString(int n, const wxString& s) +void wxComboBox::SetString(unsigned int n, const wxString& s) { wxXmString text(s); Widget listBox = GetXmList(this); @@ -178,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) -{ - wxXmString str( item.c_str() ); - XmComboBoxAddItem((Widget) m_mainWidget, str(), 0, False); - m_noStrings ++; - AdjustDropDownListSize(); - - return GetCount() - 1; -} - -int wxComboBox::DoInsert(const wxString& item, int pos) +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); + 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); + m_noStrings ++; + 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(int n) +void wxComboBox::DoDeleteOneItem(unsigned int n) { #ifdef LESSTIF_VERSION XmListDeletePos (GetXmList(this), n + 1); @@ -221,7 +220,7 @@ void wxComboBox::Delete(int n) XmComboBoxDeletePos((Widget) m_mainWidget, n+1); #endif - m_clientDataDict.Delete(n, HasClientObjectData()); + wxControlWithItems::DoDeleteOneItem(n); m_noStrings--; AdjustDropDownListSize(); @@ -234,14 +233,14 @@ void wxComboBox::Clear() #else while(m_noStrings > 0) { - XmComboBoxDeletePos((Widget) m_mainWidget, m_noStrings--); + XmComboBoxDeletePos((Widget) m_mainWidget, m_noStrings--); } #endif - if ( HasClientObjectData() ) - m_clientDataDict.DestroyData(); m_noStrings = 0; AdjustDropDownListSize(); + + wxTextEntry::Clear(); } void wxComboBox::SetSelection (int n) @@ -253,7 +252,7 @@ void wxComboBox::SetSelection (int n) SetValue(GetString(n)); #else #if 0 - wxXmString str( GetString(n).c_str() ); + wxXmString str(GetString(n).c_str()); XmComboBoxSelectItem((Widget) m_mainWidget, str()); #endif XtVaSetValues( (Widget)m_mainWidget, @@ -264,82 +263,21 @@ void wxComboBox::SetSelection (int n) m_inSetSelection = false; } -int wxComboBox::GetSelection (void) const +int wxComboBox::GetSelection() const { return wxDoGetSelectionInList( GetXmList( this ) ); } -wxString wxComboBox::GetString(int n) const +wxString wxComboBox::GetString(unsigned int n) const { return wxDoGetStringInList( GetXmList(this), n ); } -int wxComboBox::FindString(const wxString& s) const -{ - return wxDoFindStringInList( GetXmList( this ), s ); -} - -// Clipboard operations -void wxComboBox::Copy() +int wxComboBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const { - XmTextCopy( GetXmText(this), CurrentTime ); -} + // FIXME: back to base class for not supported value of bCase -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) ); -} - -long 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 ); + return wxDoFindStringInList( GetXmList( this ), s ); } void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, @@ -360,25 +298,25 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED, item->GetId()); int idx = cbs->item_position; - event.m_commandInt = idx; - event.m_commandString = item->GetString (idx); + event.SetInt(idx); + event.SetString( item->GetString (idx) ); if ( item->HasClientObjectData() ) event.SetClientObject( item->GetClientObject(idx) ); else if ( item->HasClientUntypedData() ) event.SetClientData( item->GetClientData(idx) ); - event.m_extraLong = true; + event.SetExtraLong(true); event.SetEventObject(item); - item->GetEventHandler()->ProcessEvent(event); + item->HandleWindowEvent(event); break; } 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->GetEventHandler()->ProcessEvent(event); + item->HandleWindowEvent(event); break; } default: @@ -388,7 +326,7 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, void wxComboBox::ChangeFont(bool keepOriginalSize) { - if( m_font.Ok() ) + if( m_font.Ok() && m_mainWidget != NULL ) { wxDoChangeFont( GetXmText(this), m_font ); wxDoChangeFont( GetXmList(this), m_font ); @@ -437,6 +375,11 @@ wxSize wxComboBox::DoGetBestSize() const return wxWindow::DoGetBestSize(); } +WXWidget wxComboBox::GetTextWidget() const +{ + return (WXWidget)GetXmText(this); +} + #endif // XmVersion >= 2000 #endif // wxUSE_COMBOBOX