X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89c7e9622933c3ee7906c39bc3927a7d5616b94b..95bcc40c745db8bcd392d06366436afb21964db6:/src/motif/combobox.cpp?ds=sidebyside diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp index 1ebd7a76ea..36e322073f 100644 --- a/src/motif/combobox.cpp +++ b/src/motif/combobox.cpp @@ -6,7 +6,7 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -17,63 +17,55 @@ #if wxUSE_COMBOBOX +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include -#include "combobox/combobox.h" +#ifdef __VMS__ +#pragma message enable nosimpint +#endif +#include "xmcombo/xmcombo.h" + +#include "wx/motif/private.h" void wxComboBoxCallback (Widget w, XtPointer clientData, - XmComboBoxSelectionCallbackStruct * cbs); + XmComboBoxSelectionCallbackStruct * cbs); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -#endif bool wxComboBox::Create(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, const wxString choices[], - long style, - const wxValidator& validator, - const wxString& name) -{ - SetName(name); - SetValidator(validator); - m_noStrings = n; - m_windowStyle = style; - - if (parent) parent->AddChild(this); + const wxString& value, + const wxPoint& pos, + const wxSize& size, + int n, const wxString choices[], + long style, + const wxValidator& validator, + const wxString& name) +{ + if( !CreateControl( parent, id, pos, size, style, validator, name ) ) + return FALSE; - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + m_noStrings = n; Widget parentWidget = (Widget) parent->GetClientWidget(); - Widget buttonWidget = XtVaCreateManagedWidget((char*) (const char*) name, - xmComboBoxWidgetClass, parentWidget, - XmNmarginHeight, 0, - XmNmarginWidth, 0, - XmNshowLabel, False, - XmNeditable, ((style & wxCB_READONLY) != wxCB_READONLY), - XmNsorted, ((style & wxCB_SORT) == wxCB_SORT), - XmNstaticList, ((style & wxCB_SIMPLE) == wxCB_SIMPLE), - NULL); - - XtAddCallback (buttonWidget, XmNselectionCallback, (XtCallbackProc) wxComboBoxCallback, - (XtPointer) this); - XtAddCallback (buttonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxComboBoxCallback, - (XtPointer) this); + Widget buttonWidget = XtVaCreateManagedWidget(name.c_str(), + xmComboBoxWidgetClass, parentWidget, + XmNmarginHeight, 0, + XmNmarginWidth, 0, + XmNshowLabel, False, + XmNeditable, ((style & wxCB_READONLY) != wxCB_READONLY), + XmNsorted, ((style & wxCB_SORT) == wxCB_SORT), + XmNstaticList, ((style & wxCB_SIMPLE) == wxCB_SIMPLE), + NULL); int i; for (i = 0; i < n; i++) { - XmString str = XmStringCreateLtoR((char*) (const char*) choices[i], XmSTRING_DEFAULT_CHARSET); - XmComboBoxAddItem(buttonWidget, str, 0); - XmStringFree(str); + wxXmString str( choices[i] ); + XmComboBoxAddItem(buttonWidget, str(), 0); m_stringList.Add(choices[i]); } - m_noStrings = n; m_mainWidget = (Widget) buttonWidget; @@ -81,15 +73,36 @@ 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); + SetCanAddEventHandler(TRUE); AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); - SetFont(* parent->GetFont()); - ChangeColour(m_mainWidget); + ChangeBackgroundColour(); return TRUE; } +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) +{ + // Necessary so it doesn't call wxChoice::SetSize + wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags); +} + wxString wxComboBox::GetValue() const { char *s = XmComboBoxGetString ((Widget) m_mainWidget); @@ -106,11 +119,85 @@ wxString wxComboBox::GetValue() const void wxComboBox::SetValue(const wxString& value) { m_inSetValue = TRUE; - if (!value.IsNull()) - XmComboBoxSetString ((Widget) m_mainWidget, (char*) (const char*) value); + if( !value.empty() ) + XmComboBoxSetString( (Widget)m_mainWidget, (char*)value.c_str() ); m_inSetValue = FALSE; } +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; +} + +void wxComboBox::Delete(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--; +} + +void wxComboBox::Clear() +{ + XmComboBoxDeleteAllItems((Widget) m_mainWidget); + m_stringList.Clear(); + + if ( HasClientObjectData() ) + m_clientDataDict.DestroyData(); + m_noStrings = 0; +} + +void wxComboBox::SetSelection (int n) +{ + XmComboBoxSelectPos((Widget) m_mainWidget, n+1, False); +} + +int wxComboBox::GetSelection (void) const +{ + int sel = XmComboBoxGetSelectedPos((Widget) m_mainWidget); + if (sel == 0) + return -1; + else + return sel - 1; +} + +wxString wxComboBox::GetString(int n) const +{ + wxStringList::Node *node = m_stringList.Item(n); + if (node) + return wxString(node->GetData ()); + else + return wxEmptyString; +} + +int wxComboBox::FindString(const wxString& s) const +{ + int *pos_list = NULL; + int count = 0; + wxXmString text( s ); + bool found = (XmComboBoxGetMatchPos((Widget) m_mainWidget, + text(), &pos_list, &count) != 0); + + if (found && count > 0) + { + int pos = pos_list[0] - 1; + free(pos_list); + return pos; + } + + return -1; +} + // Clipboard operations void wxComboBox::Copy() { @@ -127,7 +214,7 @@ void wxComboBox::Paste() XmComboBoxPaste((Widget) m_mainWidget); } -void wxComboBox::SetEditable(bool editable) +void wxComboBox::SetEditable(bool WXUNUSED(editable)) { // TODO } @@ -156,53 +243,87 @@ long wxComboBox::GetLastPosition() const void wxComboBox::Replace(long from, long to, const wxString& value) { XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to, - (char*) (const char*) value); + (char*) (const char*) value); } void wxComboBox::Remove(long from, long to) { XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to, - (Time) 0); + (Time) 0); XmComboBoxRemove ((Widget) m_mainWidget); } void wxComboBox::SetSelection(long from, long to) { XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to, - (Time) 0); + (Time) 0); } -void wxComboBoxCallback (Widget w, XtPointer clientData, - XmComboBoxSelectionCallbackStruct * cbs) +void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, + XmComboBoxSelectionCallbackStruct * cbs) { wxComboBox *item = (wxComboBox *) clientData; switch (cbs->reason) { - case XmCR_SINGLE_SELECT: - case XmCR_BROWSE_SELECT: + case XmCR_SINGLE_SELECT: + case XmCR_BROWSE_SELECT: { wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED, item->GetId()); - event.m_commandInt = cbs->index - 1; - // event.m_commandString = item->GetString (event.m_commandInt); - event.m_extraLong = TRUE; - event.SetEventObject(item); - item->ProcessCommand (event); - break; + event.m_commandInt = cbs->index - 1; + event.m_commandString = item->GetString (event.m_commandInt); + 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.SetEventObject(item); + item->ProcessCommand (event); + break; } - case XmCR_VALUE_CHANGED: + 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.SetEventObject(item); - item->ProcessCommand (event); + event.m_commandInt = -1; + event.m_commandString = item->GetValue(); + event.m_extraLong = TRUE; + event.SetEventObject(item); + item->ProcessCommand (event); break; } - default: - break; + default: + break; + } +} + +void wxComboBox::ChangeFont(bool keepOriginalSize) +{ + // Don't use the base class wxChoice's ChangeFont + wxWindow::ChangeFont(keepOriginalSize); +} + +void wxComboBox::ChangeBackgroundColour() +{ + wxWindow::ChangeBackgroundColour(); +} + +void wxComboBox::ChangeForegroundColour() +{ + wxWindow::ChangeForegroundColour(); +} + +wxSize wxComboBox::DoGetBestSize() const +{ + if( (GetWindowStyle() & wxCB_DROPDOWN) == wxCB_DROPDOWN || + (GetWindowStyle() & wxCB_READONLY) == wxCB_READONLY ) + { + wxSize items = GetItemsSize(); + // FIXME arbitrary constants + return wxSize( ( items.x ? items.x + 50 : 120 ), + items.y + 10 ); } + else + return wxWindow::DoGetBestSize(); } #endif