X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/motif/combobox.cpp diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp index d1c470999e..de2b16e9b1 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,13 +9,16 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "combobox.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_COMBOBOX #include "wx/combobox.h" -#if wxUSE_COMBOBOX +#ifndef WX_PRECOMP + #include "wx/arrstr.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -24,8 +27,14 @@ #ifdef __VMS__ #pragma message enable nosimpint #endif + +// use the old, GPL'd combobox +#if (XmVersion < 2000) + #include "xmcombo/xmcombo.h" +#include "wx/motif/private.h" + void wxComboBoxCallback (Widget w, XtPointer clientData, XmComboBoxSelectionCallbackStruct * cbs); @@ -40,20 +49,10 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - SetName(name); - SetValidator(validator); - m_noStrings = n; - m_windowStyle = style; - // m_backgroundColour = parent->GetBackgroundColour(); - m_backgroundColour = * wxWHITE; - m_foregroundColour = parent->GetForegroundColour(); + if( !CreateControl( parent, id, pos, size, style, validator, name ) ) + return false; - if (parent) parent->AddChild(this); - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + m_noStrings = n; Widget parentWidget = (Widget) parent->GetClientWidget(); @@ -70,12 +69,10 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, 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; @@ -83,20 +80,32 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, SetValue(value); - m_font = parent->GetFont(); - ChangeFont(FALSE); + 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); 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() @@ -104,12 +113,16 @@ 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, height, sizeFlags); + wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags); } wxString wxComboBox::GetValue() const @@ -127,40 +140,55 @@ wxString wxComboBox::GetValue() const void wxComboBox::SetValue(const wxString& value) { - m_inSetValue = TRUE; - if (!value.IsNull()) - XmComboBoxSetString ((Widget) m_mainWidget, (char*) (const char*) value); - m_inSetValue = FALSE; + m_inSetValue = true; + if( !value.empty() ) + XmComboBoxSetString( (Widget)m_mainWidget, + wxConstCast(value.c_str(), char) ); + m_inSetValue = false; +} + +void wxComboBox::SetString(unsigned int WXUNUSED(n), const wxString& WXUNUSED(s)) +{ + wxFAIL_MSG( wxT("wxComboBox::SetString only implemented for Motif 2.0") ); } -void wxComboBox::Append(const wxString& item) +int wxComboBox::DoAppend(const wxString& item) { - XmString str = XmStringCreateLtoR((char*) (const char*) item, XmSTRING_DEFAULT_CHARSET); - XmComboBoxAddItem((Widget) m_mainWidget, str, 0); + wxXmString str( item.c_str() ); + XmComboBoxAddItem((Widget) m_mainWidget, str(), 0); m_stringList.Add(item); - XmStringFree(str); m_noStrings ++; + + return GetCount() - 1; } -void wxComboBox::Delete(int n) +int wxComboBox::DoInsert(const wxString& item, unsigned int pos) { - XmComboBoxDeletePos((Widget) m_mainWidget, n-1); - wxNode *node = m_stringList.Nth(n); - if (node) - { - delete[] (char *)node->Data(); - delete node; - } - node = m_clientList.Nth( n ); + wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list")); + wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index")); + + 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 ++; + + return pos; +} + +void wxComboBox::Delete(unsigned int n) +{ + XmComboBoxDeletePos((Widget) m_mainWidget, n+1); + wxStringList::Node *node = m_stringList.Item(n); if (node) { - if ( HasClientObjectData() ) - { - delete (wxClientData *)node->Data(); - } + delete[] node->GetData(); delete node; } - + m_clientDataDict.Delete(n, HasClientObjectData()); m_noStrings--; } @@ -170,18 +198,7 @@ void wxComboBox::Clear() m_stringList.Clear(); if ( HasClientObjectData() ) - { - // destroy the data (due to Robert's idea of using wxList - // and not wxList we can't just say - // m_clientList.DeleteContents(TRUE) - this would crash! - wxNode *node = m_clientList.First(); - while ( node ) - { - delete (wxClientData *)node->Data(); - node = node->Next(); - } - } - m_clientList.Clear(); + m_clientDataDict.DestroyData(); m_noStrings = 0; } @@ -199,45 +216,24 @@ int wxComboBox::GetSelection (void) const return sel - 1; } -wxString wxComboBox::GetString(int n) const +wxString wxComboBox::GetString(unsigned int n) const { - wxNode *node = m_stringList.Nth (n); + wxStringList::Node *node = m_stringList.Item(n); if (node) - return wxString((char *) node->Data ()); + return wxString(node->GetData ()); else return wxEmptyString; } -wxString wxComboBox::GetStringSelection() const -{ - int sel = GetSelection(); - if (sel == -1) - return wxEmptyString; - else - return GetString(sel); -} - -bool wxComboBox::SetStringSelection(const wxString& sel) +int wxComboBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const { - int n = FindString(sel); - if (n == -1) - return FALSE; - else - { - SetSelection(n); - return TRUE; - } -} + // FIXME: back to base class for not supported value of bCase -int wxComboBox::FindString(const wxString& s) const -{ int *pos_list = NULL; int count = 0; - XmString text = XmStringCreateSimple ((char*) (const char*) s); + wxXmString text( s ); bool found = (XmComboBoxGetMatchPos((Widget) m_mainWidget, - text, &pos_list, &count) != 0); - - XmStringFree(text); + text(), &pos_list, &count) != 0); if (found && count > 0) { @@ -246,7 +242,7 @@ int wxComboBox::FindString(const wxString& s) const return pos; } - return -1; + return wxNOT_FOUND; } // Clipboard operations @@ -286,15 +282,16 @@ long wxComboBox::GetInsertionPoint() const return (long) XmComboBoxGetInsertionPosition ((Widget) m_mainWidget); } -long wxComboBox::GetLastPosition() const +wxTextPos wxComboBox::GetLastPosition() const { - return (long) XmComboBoxGetLastPosition ((Widget) m_mainWidget); + return (wxTextPos) XmComboBoxGetLastPosition ((Widget) m_mainWidget); } void wxComboBox::Replace(long from, long to, const wxString& value) { - XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to, - (char*) (const char*) value); + XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from, + (XmTextPosition) to, + wxConstCast(value.c_str(), char)); } void wxComboBox::Remove(long from, long to) @@ -320,10 +317,15 @@ void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData, 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; + wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED, + item->GetId()); + 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.SetExtraLong(true); event.SetEventObject(item); item->ProcessCommand (event); break; @@ -331,9 +333,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; @@ -356,8 +358,23 @@ void wxComboBox::ChangeBackgroundColour() void wxComboBox::ChangeForegroundColour() { - wxWindow::ChangeBackgroundColour(); + wxWindow::ChangeForegroundColour(); } -#endif +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 // XmVersion < 2000 +#endif // wxUSE_COMBOBOX