X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..7e48d7d9fb4b546e6a68239e8a77ce7ef79df3b0:/src/motif/listbox.cpp diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp index 1bead5e8e5..2107f2e894 100644 --- a/src/motif/listbox.cpp +++ b/src/motif/listbox.cpp @@ -10,36 +10,43 @@ /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "listbox.h" + #pragma implementation "listbox.h" #endif -#include "wx/listbox.h" +#ifdef __VMS +#define XtParent XTPARENT +#define XtDisplay XTDISPLAY +#endif + +# include "wx/listbox.h" #include "wx/settings.h" #include "wx/dynarray.h" #include "wx/log.h" #include "wx/utils.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include -#include "wx/motif/private.h" - -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) +#ifdef __VMS__ +#pragma message enable nosimpint #endif +#include "wx/motif/private.h" -void wxListBoxCallback (Widget w, XtPointer clientData, - XmListCallbackStruct * cbs); + IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) -void wxListBoxDefaultActionProc (Widget list_w, XtPointer client_data, XmListCallbackStruct * cbs); +static void wxListBoxCallback(Widget w, + XtPointer clientData, + XmListCallbackStruct * cbs); // ============================================================================ // list box control implementation // ============================================================================ // Listbox item -wxListBox::wxListBox(): m_clientDataList(wxKEY_INTEGER) +wxListBox::wxListBox() : m_clientDataList(wxKEY_INTEGER) { m_noItems = 0; - m_selected = 0; } bool wxListBox::Create(wxWindow *parent, wxWindowID id, @@ -52,20 +59,19 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, { m_windowStyle = style; m_noItems = n; - m_selected = 0; // m_backgroundColour = parent->GetBackgroundColour(); m_backgroundColour = * wxWHITE; m_foregroundColour = parent->GetForegroundColour(); - + SetName(name); SetValidator(validator); - + if (parent) parent->AddChild(this); - + m_windowId = ( id == -1 ) ? (int)NewControlId() : id; - + Widget parentWidget = (Widget) parent->GetClientWidget(); - + Arg args[3]; int count; XtSetArg (args[0], XmNlistSizePolicy, XmCONSTANT); @@ -82,40 +88,49 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, } else count = 2; - - Widget listWidget = XmCreateScrolledList (parentWidget, (char*) (const char*) name, args, count); - + + Widget listWidget = XmCreateScrolledList(parentWidget, + (char*)name.c_str(), args, count); + m_mainWidget = (WXWidget) listWidget; - + Set(n, choices); - + XtManageChild (listWidget); - + long width = size.x; long height = size.y; if (width == -1) width = 150; if (height == -1) height = 80; - - XtAddCallback (listWidget, XmNbrowseSelectionCallback, (XtCallbackProc) wxListBoxCallback, - (XtPointer) this); - XtAddCallback (listWidget, XmNextendedSelectionCallback, (XtCallbackProc) wxListBoxCallback, - (XtPointer) this); - XtAddCallback (listWidget, XmNmultipleSelectionCallback, (XtCallbackProc) wxListBoxCallback, - (XtPointer) this); - - XtAddCallback (listWidget, XmNdefaultActionCallback, (XtCallbackProc) wxListBoxDefaultActionProc, - (XtPointer) this); - - m_windowFont = parent->GetFont(); + + XtAddCallback (listWidget, + XmNbrowseSelectionCallback, + (XtCallbackProc) wxListBoxCallback, + (XtPointer) this); + XtAddCallback (listWidget, + XmNextendedSelectionCallback, + (XtCallbackProc) wxListBoxCallback, + (XtPointer) this); + XtAddCallback (listWidget, + XmNmultipleSelectionCallback, + (XtCallbackProc) wxListBoxCallback, + (XtPointer) this); + XtAddCallback (listWidget, + XmNdefaultActionCallback, + (XtCallbackProc) wxListBoxCallback, + (XtPointer) this); + + m_font = parent->GetFont(); ChangeFont(FALSE); - + SetCanAddEventHandler(TRUE); - AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, width, height); - + AttachWidget (parent, m_mainWidget, (WXWidget) NULL, + pos.x, pos.y, width, height); + ChangeBackgroundColour(); - + return TRUE; } @@ -123,74 +138,70 @@ wxListBox::~wxListBox() { } -void wxListBox::SetFirstItem(int N) +void wxListBox::DoSetFirstItem( int N ) { int count, length; - + if (N < 0) return; XtVaGetValues ((Widget) m_mainWidget, - XmNvisibleItemCount, &count, - XmNitemCount, &length, - NULL); + XmNvisibleItemCount, &count, + XmNitemCount, &length, + NULL); if ((N + count) >= length) N = length - count; XmListSetPos ((Widget) m_mainWidget, N + 1); } -void wxListBox::SetFirstItem(const wxString& s) -{ - int N = FindString (s); - - if (N >= 0) - SetFirstItem (N); -} - void wxListBox::Delete(int N) { int width1, height1; int width2, height2; Widget listBox = (Widget) m_mainWidget; GetSize (&width1, &height1); - + bool managed = XtIsManaged(listBox); - + if (managed) XtUnmanageChild (listBox); - + XmListDeletePos (listBox, N + 1); - + if (managed) XtManageChild (listBox); - + GetSize (&width2, &height2); // Correct for randomly resized listbox - bad boy, Motif! if (width1 != width2 || height1 != height2) SetSize (-1, -1, width1, height1); - + // (JDH) need to add code here to take care of clientDataList - wxNode *node = m_clientDataList.Find((long)N); // get item from list - if (node) m_clientDataList.DeleteNode(node); // if existed then delete from list - node = m_clientDataList.First(); // we now have to adjust all keys that - while (node) // are >=N+1 - { if (node->GetKeyInteger() >= (long)(N+1)) - node->SetKeyInteger(node->GetKeyInteger() - 1); - node = node->Next(); + // get item from list + wxNode *node = m_clientDataList.Find((long)N); + // if existed then delete from list + if (node) m_clientDataList.DeleteNode(node); + // we now have to adjust all keys that are >=N+1 + node = m_clientDataList.First(); + while (node) + { + if (node->GetKeyInteger() >= (long)(N+1)) + node->SetKeyInteger(node->GetKeyInteger() - 1); + node = node->Next(); } - + m_noItems --; } -void wxListBox::Append(const wxString& item) +int wxListBox::DoAppend(const wxString& item) { int width1, height1; int width2, height2; - + Widget listBox = (Widget) m_mainWidget; GetSize (&width1, &height1); - + bool managed = XtIsManaged(listBox); - + if (managed) XtUnmanageChild (listBox); int n; @@ -199,7 +210,7 @@ void wxListBox::Append(const wxString& item) // XmListAddItem(listBox, text, n + 1); XmListAddItemUnselected (listBox, text, 0); XmStringFree (text); - + // It seems that if the list is cleared, we must re-ask for // selection policy!! Arg args[3]; @@ -211,37 +222,46 @@ void wxListBox::Append(const wxString& item) else XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT); XtSetValues (listBox, args, 2); - + if (managed) XtManageChild (listBox); - + GetSize (&width2, &height2); // Correct for randomly resized listbox - bad boy, Motif! if (width1 != width2 || height1 != height2) SetSize (-1, -1, width1, height1); m_noItems ++; + + return GetCount() - 1; } -void wxListBox::Append(const wxString& item, char *clientData) +void wxListBox::DoSetItems(const wxArrayString& items, void** clientData) { + m_clientDataList.Clear(); int width1, height1; int width2, height2; - + Widget listBox = (Widget) m_mainWidget; - GetSize (&width1, &height1); - Bool managed = XtIsManaged(listBox); - + + bool managed = XtIsManaged(listBox); + if (managed) XtUnmanageChild (listBox); - - int n; - XtVaGetValues (listBox, XmNitemCount, &n, NULL); - XmString text = XmStringCreateSimple ((char*) (const char*) item); - // XmListAddItem(listBox, text, n + 1); - XmListAddItemUnselected (listBox, text, 0); - XmStringFree (text); - + XmString *text = new XmString[items.GetCount()]; + size_t i; + for (i = 0; i < items.GetCount(); ++i) + text[i] = XmStringCreateSimple ((char*)items[i].c_str()); + + if ( clientData ) + for (i = 0; i < items.GetCount(); ++i) + m_clientDataList.Append ((long) i, (wxObject *) clientData[i]); + + XmListAddItems (listBox, text, items.GetCount(), 0); + for (i = 0; i < items.GetCount(); i++) + XmStringFree (text[i]); + delete[] text; + // It seems that if the list is cleared, we must re-ask for // selection policy!! Arg args[3]; @@ -253,77 +273,16 @@ void wxListBox::Append(const wxString& item, char *clientData) else XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT); XtSetValues (listBox, args, 2); - - m_clientDataList.Append ((long) n, (wxObject *) clientData); - + if (managed) XtManageChild (listBox); - + GetSize (&width2, &height2); - // Correct for randomly resized listbox - bad boy, Motif! if (width1 != width2 || height1 != height2) SetSize (-1, -1, width1, height1); - - m_noItems ++; -} -void wxListBox::Set(int n, const wxString *choices, char** clientData) -{ - m_clientDataList.Clear(); - int width1, height1; - int width2, height2; - - Widget listBox = (Widget) m_mainWidget; - GetSize (&width1, &height1); - - bool managed = XtIsManaged(listBox); - - if (managed) - XtUnmanageChild (listBox); - /*** - for (int i=0; iData (); + return (void *) node->Data (); else return NULL; } -void wxListBox::SetClientData(int N, char *Client_data) +void wxListBox::DoSetItemClientData(int N, void *Client_data) { wxNode *node = m_clientDataList.Find ((long) N); if (node) @@ -445,7 +415,7 @@ void wxListBox::SetClientData(int N, char *Client_data) int wxListBox::GetSelections(wxArrayInt& aSelections) const { aSelections.Empty(); - + Widget listBox = (Widget) m_mainWidget; int *posList = NULL; int posCnt = 0; @@ -455,11 +425,11 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const if (posCnt > 0) { aSelections.Alloc(posCnt); - + int i; for (i = 0; i < posCnt; i++) aSelections.Add(posList[i] - 1); - + XtFree ((char *) posList); return posCnt; } @@ -515,11 +485,11 @@ wxString wxListBox::GetString(int N) const void wxListBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { wxWindow::DoSetSize(x, y, width, height, sizeFlags); - + // Check resulting size is correct int tempW, tempH; GetSize (&tempW, &tempH); - + /* if (tempW != width || tempH != height) { @@ -528,42 +498,41 @@ void wxListBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) */ } -void wxListBox::InsertItems(int nItems, const wxString items[], int pos) +void wxListBox::DoInsertItems(const wxArrayString& items, int pos) { int width1, height1; int width2, height2; - + Widget listBox = (Widget) m_mainWidget; - + GetSize(&width1, &height1); - + bool managed = XtIsManaged(listBox); - + if (managed) XtUnmanageChild(listBox); - - XmString *text = new XmString[nItems]; - int i; + + XmString *text = new XmString[items.GetCount()]; + size_t i; // Steve Hammes: Motif 1.1 compatibility // #if XmVersion > 1100 // Corrected by Sergey Krasnov from Steve Hammes' code #if XmVersion > 1001 - for (i = 0; i < nItems; i++) - text[i] = XmStringCreateSimple((char*) (const char*) items[i]); - XmListAddItemsUnselected(listBox, text, nItems, pos+1); + for (i = 0; i < items.GetCount(); i++) + text[i] = XmStringCreateSimple((char*)items[i].c_str()); + XmListAddItemsUnselected(listBox, text, items.GetCount(), pos+1); #else - for (i = 0; i < nItems; i++) + for (i = 0; i < items.GetCount(); i++) { - text[i] = XmStringCreateSimple((char*) (const char*) items[i]); - // XmListAddItemUnselected(listBox, text[i], i); - XmListAddItemUnselected(listBox, text[i], pos+i+1); // Another Sergey correction + text[i] = XmStringCreateSimple((char*)items[i].c_str()); + // Another Sergey correction + XmListAddItemUnselected(listBox, text[i], pos+i+1); } #endif - for (i = 0; i < nItems; i++) + for (i = 0; i < items.GetCount(); i++) XmStringFree(text[i]); - delete[] text; - + // It seems that if the list is cleared, we must re-ask for // selection policy!! Arg args[3]; @@ -574,83 +543,41 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos) XtSetArg(args[1], XmNselectionPolicy, XmEXTENDED_SELECT); else XtSetArg(args[1], XmNselectionPolicy, XmBROWSE_SELECT); XtSetValues(listBox,args,2) ; - + if (managed) XtManageChild(listBox); - + GetSize(&width2, &height2); // Correct for randomly resized listbox - bad boy, Motif! if (width1 != width2 /*|| height1 != height2*/) SetSize(-1, -1, width1, height1); - - m_noItems += nItems; + + m_noItems += items.GetCount(); } void wxListBox::SetString(int N, const wxString& s) { int width1, height1; int width2, height2; - + Widget listBox = (Widget) m_mainWidget; GetSize (&width1, &height1); - + XmString text = XmStringCreateSimple ((char*) (const char*) s); - - // WHAT'S THE MOTIF CALL TO SET THE TEXT OF AN EXISTING - // ITEM??? - // There isn't one, so delete the item and add it again. + + // delete the item and add it again. + // FIXME isn't there a way to change it in place? XmListDeletePos (listBox, N+1); XmListAddItem (listBox, text, N+1); - + XmStringFree(text); - - /* - // It seems that if the list is cleared, we must re-ask for - // selection policy!! - Arg args[3]; - XtSetArg (args[0], XmNlistSizePolicy, XmCONSTANT); - if (m_windowStyle & wxLB_MULTIPLE) - XtSetArg (args[1], XmNselectionPolicy, XmMULTIPLE_SELECT); - else if (m_windowStyle & wxLB_EXTENDED) - XtSetArg (args[1], XmNselectionPolicy, XmEXTENDED_SELECT); - else - XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT); - XtSetValues (listBox, args, 2); - */ - + GetSize (&width2, &height2); // Correct for randomly resized listbox - bad boy, Motif! if (width1 != width2 || height1 != height2) SetSize (-1, -1, width1, height1); } -int wxListBox::Number () const -{ - return m_noItems; -} - -// For single selection items only -wxString wxListBox::GetStringSelection () const -{ - int sel = GetSelection (); - if (sel > -1) - return this->GetString (sel); - else - return wxString(""); -} - -bool wxListBox::SetStringSelection (const wxString& s, bool flag) -{ - int sel = FindString (s); - if (sel > -1) - { - SetSelection (sel, flag); - return TRUE; - } - else - return FALSE; -} - void wxListBox::Command (wxCommandEvent & event) { if (event.m_extraLong) @@ -663,81 +590,64 @@ void wxListBox::Command (wxCommandEvent & event) ProcessCommand (event); } -void wxListBoxCallback (Widget w, XtPointer clientData, +void wxListBoxCallback (Widget WXUNUSED(w), XtPointer clientData, XmListCallbackStruct * cbs) { -/* - if (cbs->reason == XmCR_EXTENDED_SELECT) - cout << "*** Extend select\n"; - else if (cbs->reason == XmCR_SINGLE_SELECT) - cout << "*** Single select\n"; - else if (cbs->reason == XmCR_MULTIPLE_SELECT) - cout << "*** Multiple select\n"; - else if (cbs->reason == XmCR_BROWSE_SELECT) - cout << "*** Browse select\n"; - - if (cbs->selection_type == XmMODIFICATION) - cout << "*** Modification\n"; - else if (cbs->selection_type == XmINITIAL) - cout << "*** Initial\n"; - else if (cbs->selection_type == XmADDITION) - cout << "*** Addition\n"; - */ - wxListBox *item = (wxListBox *) clientData; - + if (item->InSetValue()) return; - - wxCommandEvent event (wxEVT_COMMAND_LISTBOX_SELECTED, item->GetId()); + + wxEventType evtType; + + if( cbs->reason == XmCR_DEFAULT_ACTION ) + evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED; + else + evtType = wxEVT_COMMAND_LISTBOX_SELECTED; + + int n = cbs->item_position - 1; + wxCommandEvent event (evtType, item->GetId()); + if ( item->HasClientObjectData() ) + event.SetClientObject( item->GetClientObject(n) ); + else if ( item->HasClientUntypedData() ) + event.SetClientData( item->GetClientData(n) ); + event.m_commandInt = n; + event.m_extraLong = TRUE; + event.SetEventObject(item); + event.SetString( item->GetString( n ) ); + + int x = -1; + if( cbs->event->type == ButtonRelease ) + { + XButtonEvent* evt = (XButtonEvent*)cbs->event; + + x = evt->x; + } + switch (cbs->reason) { case XmCR_MULTIPLE_SELECT: case XmCR_BROWSE_SELECT: - { - event.m_clientData = item->GetClientData (cbs->item_position - 1); - //event.commandString = item->GetStringSelection(); - event.m_commandInt = cbs->item_position - 1; - event.m_extraLong = TRUE; - event.SetEventObject(item); - item->ProcessCommand (event); - //delete[] event.commandString; // Let's not store the command string any more - break; - } +#if wxUSE_CHECKLISTBOX + item->DoToggleItem( n, x ); +#endif + case XmCR_DEFAULT_ACTION: + item->GetEventHandler()->ProcessEvent(event); + break; case XmCR_EXTENDED_SELECT: + switch (cbs->selection_type) { - switch (cbs->selection_type) - { - case XmINITIAL: - case XmADDITION: - case XmMODIFICATION: - { - event.m_clientData = item->GetClientData (cbs->item_position - 1); - event.m_commandInt = cbs->item_position - 1; - event.m_extraLong = TRUE; - event.SetEventObject(item); - item->ProcessCommand (event); - break; - } - } + case XmINITIAL: + case XmADDITION: + case XmMODIFICATION: + item->DoToggleItem( n, x ); + item->GetEventHandler()->ProcessEvent(event); break; } + break; } } -/* Respond by getting the -* designated "default button" in the action area and activate it -* as if the user had selected it. -*/ -void wxListBoxDefaultActionProc (Widget list_w, XtPointer client_data, XmListCallbackStruct * cbs) -{ - wxListBox *lbox = (wxListBox *) client_data; - - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, lbox->GetId()); - event.SetEventObject( lbox ); - lbox->GetEventHandler()->ProcessEvent(event) ; -} - WXWidget wxListBox::GetTopWidget() const { return (WXWidget) XtParent( (Widget) m_mainWidget ); @@ -751,19 +661,19 @@ void wxListBox::ChangeFont(bool keepOriginalSize) void wxListBox::ChangeBackgroundColour() { wxWindow::ChangeBackgroundColour(); - + Widget parent = XtParent ((Widget) m_mainWidget); Widget hsb, vsb; - + XtVaGetValues (parent, XmNhorizontalScrollBar, &hsb, XmNverticalScrollBar, &vsb, NULL); - + /* TODO: should scrollbars be affected? Should probably have separate * function to change them (by default, taken from wxSystemSettings) */ - wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); + wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE); DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE); @@ -773,27 +683,32 @@ void wxListBox::ChangeBackgroundColour() XtVaSetValues (vsb, XmNtroughColor, backgroundColour.AllocColour(XtDisplay(vsb)), NULL); - + DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE); } void wxListBox::ChangeForegroundColour() { wxWindow::ChangeForegroundColour(); - + Widget parent = XtParent ((Widget) m_mainWidget); Widget hsb, vsb; - - XtVaGetValues (parent, - XmNhorizontalScrollBar, &hsb, - XmNverticalScrollBar, &vsb, - NULL); - /* TODO: should scrollbars be affected? Should probably have separate - * function to change them (by default, taken from wxSystemSettings) + + XtVaGetValues(parent, + XmNhorizontalScrollBar, &hsb, + XmNverticalScrollBar, &vsb, + NULL); + + /* TODO: should scrollbars be affected? Should probably have separate + function to change them (by default, taken from wxSystemSettings) + DoChangeForegroundColour((WXWidget) hsb, m_foregroundColour); DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour); DoChangeForegroundColour((WXWidget) parent, m_foregroundColour); */ } - +int wxListBox::GetCount() const +{ + return m_noItems; +}