X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8aa04e8bf1638ed4d9355e560c8d718c8be4667a..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/motif/combobox.cpp diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp index 4537779eb6..d1c470999e 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,55 +17,55 @@ #if wxUSE_COMBOBOX +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif #include "xmcombo/xmcombo.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) + 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; - m_backgroundColour = parent->GetBackgroundColour(); + // m_backgroundColour = parent->GetBackgroundColour(); + m_backgroundColour = * wxWHITE; m_foregroundColour = parent->GetForegroundColour(); if (parent) parent->AddChild(this); if ( id == -1 ) - m_windowId = (int)NewControlId(); + m_windowId = (int)NewControlId(); else - m_windowId = id; + m_windowId = id; 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++) @@ -83,9 +83,14 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, SetValue(value); - m_windowFont = parent->GetFont(); + m_font = parent->GetFont(); 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); @@ -101,10 +106,10 @@ wxComboBox::~wxComboBox() m_mainWidget = (WXWidget) 0; } -void wxComboBox::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { // Necessary so it doesn't call wxChoice::SetSize - wxWindow::SetSize(x, y, width, height, sizeFlags); + wxWindow::DoSetSize(x, y, width, height, sizeFlags); } wxString wxComboBox::GetValue() const @@ -143,9 +148,19 @@ void wxComboBox::Delete(int n) wxNode *node = m_stringList.Nth(n); if (node) { - delete[] (char *)node->Data(); - delete node; + delete[] (char *)node->Data(); + delete node; + } + node = m_clientList.Nth( n ); + if (node) + { + if ( HasClientObjectData() ) + { + delete (wxClientData *)node->Data(); + } + delete node; } + m_noStrings--; } @@ -153,6 +168,21 @@ void wxComboBox::Clear() { XmComboBoxDeleteAllItems((Widget) m_mainWidget); 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_noStrings = 0; } void wxComboBox::SetSelection (int n) @@ -162,20 +192,20 @@ void wxComboBox::SetSelection (int n) int wxComboBox::GetSelection (void) const { - int sel = XmComboBoxGetSelectedPos((Widget) m_mainWidget); - if (sel == 0) - return -1; - else - return sel - 1; + int sel = XmComboBoxGetSelectedPos((Widget) m_mainWidget); + if (sel == 0) + return -1; + else + return sel - 1; } wxString wxComboBox::GetString(int n) const { wxNode *node = m_stringList.Nth (n); if (node) - return wxString((char *) node->Data ()); + return wxString((char *) node->Data ()); else - return wxEmptyString; + return wxEmptyString; } wxString wxComboBox::GetStringSelection() const @@ -201,22 +231,22 @@ bool wxComboBox::SetStringSelection(const wxString& sel) int wxComboBox::FindString(const wxString& s) const { - int *pos_list = NULL; - int count = 0; - XmString text = XmStringCreateSimple ((char*) (const char*) s); - bool found = (XmComboBoxGetMatchPos((Widget) m_mainWidget, - text, &pos_list, &count) != 0); - - XmStringFree(text); - - if (found && count > 0) - { - int pos = pos_list[0] - 1; - free(pos_list); - return pos; - } - - return -1; + int *pos_list = NULL; + int count = 0; + XmString text = XmStringCreateSimple ((char*) (const char*) s); + bool found = (XmComboBoxGetMatchPos((Widget) m_mainWidget, + text, &pos_list, &count) != 0); + + XmStringFree(text); + + if (found && count > 0) + { + int pos = pos_list[0] - 1; + free(pos_list); + return pos; + } + + return -1; } // Clipboard operations @@ -264,52 +294,52 @@ 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 WXUNUSED(w), XtPointer clientData, - XmComboBoxSelectionCallbackStruct * cbs) + 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); + 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; } }