X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..4b5386874a1602f5c8b6edbfa74e4d6be619768f:/src/motif/listbox.cpp?ds=inline diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp index d8b12adf8a..1ad6566347 100644 --- a/src/motif/listbox.cpp +++ b/src/motif/listbox.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "listbox.h" #endif @@ -23,6 +23,7 @@ #include "wx/dynarray.h" #include "wx/log.h" #include "wx/utils.h" +#include "wx/arrstr.h" #ifdef __VMS__ #pragma message disable nosimpint @@ -39,12 +40,38 @@ static void wxListBoxCallback(Widget w, XtPointer clientData, XmListCallbackStruct * cbs); +// ---------------------------------------------------------------------------- +// wxSizeKeeper +// ---------------------------------------------------------------------------- + +// helper class to reduce code duplication +class wxSizeKeeper +{ + int m_x, m_y; + wxWindow* m_w; +public: + wxSizeKeeper( wxWindow* w ) + : m_w( w ) + { + m_w->GetSize( &m_x, &m_y ); + } + + void Restore() + { + int x, y; + + m_w->GetSize( &x, &y ); + if( x != m_x || y != m_y ) + m_w->SetSize( -1, -1, m_x, m_y ); + } +}; + // ============================================================================ // list box control implementation // ============================================================================ // Listbox item -wxListBox::wxListBox() : m_clientDataList(wxKEY_INTEGER) +wxListBox::wxListBox() { m_noItems = 0; } @@ -57,40 +84,44 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - m_windowStyle = style; + if( !wxControl::CreateControl( parent, id, pos, size, style, + validator, name ) ) + return FALSE; + m_noItems = n; - // m_backgroundColour = parent->GetBackgroundColour(); m_backgroundColour = * wxWHITE; - m_foregroundColour = parent->GetForegroundColour(); - - SetName(name); - SetValidator(validator); - if (parent) parent->AddChild(this); + Widget parentWidget = (Widget) parent->GetClientWidget(); - m_windowId = ( id == -1 ) ? (int)NewControlId() : id; + WXFontType fontType = (WXFontType)NULL; - Widget parentWidget = (Widget) parent->GetClientWidget(); + if( m_font.Ok() ) + { + fontType = m_font.GetFontType(XtDisplay(parentWidget)); + } - Arg args[3]; - int count; - 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); - if (m_windowStyle & wxLB_ALWAYS_SB) + Arg args[4]; + int count = 0; + XtSetArg( args[count], XmNlistSizePolicy, XmCONSTANT ); ++count; + XtSetArg( args[count], XmNselectionPolicy, + ( m_windowStyle & wxLB_MULTIPLE ) ? XmMULTIPLE_SELECT : + ( m_windowStyle & wxLB_EXTENDED ) ? XmEXTENDED_SELECT : + XmBROWSE_SELECT ); + ++count; + if( fontType ) { - XtSetArg (args[2], XmNscrollBarDisplayPolicy, XmSTATIC); - count = 3; + XtSetArg( args[count], (String)wxFont::GetFontTag(), fontType ); + ++count; + } + if( m_windowStyle & wxLB_ALWAYS_SB ) + { + XtSetArg( args[count], XmNscrollBarDisplayPolicy, XmSTATIC ); + ++count; } - else - count = 2; - Widget listWidget = XmCreateScrolledList(parentWidget, - (char*)name.c_str(), args, count); + Widget listWidget = + XmCreateScrolledList(parentWidget, + wxConstCast(name.c_str(), char), args, count); m_mainWidget = (WXWidget) listWidget; @@ -98,12 +129,9 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, XtManageChild (listWidget); - long width = size.x; - long height = size.y; - if (width == -1) - width = 150; - if (height == -1) - height = 80; + wxSize best = GetBestSize(); + if( size.x != -1 ) best.x = size.x; + if( size.y != -1 ) best.y = size.y; XtAddCallback (listWidget, XmNbrowseSelectionCallback, @@ -122,20 +150,46 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, (XtCallbackProc) wxListBoxCallback, (XtPointer) this); - m_font = parent->GetFont(); - ChangeFont(FALSE); - - SetCanAddEventHandler(TRUE); AttachWidget (parent, m_mainWidget, (WXWidget) NULL, - pos.x, pos.y, width, height); + pos.x, pos.y, best.x, best.y); ChangeBackgroundColour(); return TRUE; } +bool wxListBox::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name) +{ + wxCArrayString chs(choices); + return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(), + style, validator, name); +} + wxListBox::~wxListBox() { + if( HasClientObjectData() ) + m_clientDataDict.DestroyData(); +} + +void wxListBox::SetSelectionPolicy() +{ + Widget listBox = (Widget)m_mainWidget; + Arg args[3]; + + XtSetArg( args[0], XmNlistSizePolicy, XmCONSTANT ); + + XtSetArg( args[1], XmNselectionPolicy, + ( m_windowStyle & wxLB_MULTIPLE ) ? XmMULTIPLE_SELECT : + ( m_windowStyle & wxLB_EXTENDED ) ? XmEXTENDED_SELECT : + XmBROWSE_SELECT ); + + XtSetValues( listBox, args, 2 ); } void wxListBox::DoSetFirstItem( int N ) @@ -155,10 +209,8 @@ void wxListBox::DoSetFirstItem( int N ) void wxListBox::Delete(int N) { - int width1, height1; - int width2, height2; + wxSizeKeeper sk( this ); Widget listBox = (Widget) m_mainWidget; - GetSize (&width1, &height1); bool managed = XtIsManaged(listBox); @@ -170,35 +222,15 @@ void wxListBox::Delete(int N) 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 - // 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(); - } - + sk.Restore(); + m_clientDataDict.Delete(N, HasClientObjectData()); m_noItems --; } int wxListBox::DoAppend(const wxString& item) { - int width1, height1; - int width2, height2; - + wxSizeKeeper sk( this ); Widget listBox = (Widget) m_mainWidget; - GetSize (&width1, &height1); bool managed = XtIsManaged(listBox); @@ -206,30 +238,18 @@ int wxListBox::DoAppend(const wxString& item) XtUnmanageChild (listBox); int n; XtVaGetValues (listBox, XmNitemCount, &n, NULL); - XmString text = XmStringCreateSimple ((char*) (const char*) item); + wxXmString text( item ); // XmListAddItem(listBox, text, n + 1); - XmListAddItemUnselected (listBox, text, 0); - XmStringFree (text); + XmListAddItemUnselected (listBox, text(), 0); // 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); + SetSelectionPolicy(); 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); + sk.Restore(); m_noItems ++; return GetCount() - 1; @@ -237,12 +257,11 @@ int wxListBox::DoAppend(const wxString& item) void wxListBox::DoSetItems(const wxArrayString& items, void** clientData) { - m_clientDataList.Clear(); - int width1, height1; - int width2, height2; - + wxSizeKeeper sk( this ); Widget listBox = (Widget) m_mainWidget; - GetSize (&width1, &height1); + + if( HasClientObjectData() ) + m_clientDataDict.DestroyData(); bool managed = XtIsManaged(listBox); @@ -251,11 +270,11 @@ void wxListBox::DoSetItems(const wxArrayString& items, void** clientData) XmString *text = new XmString[items.GetCount()]; size_t i; for (i = 0; i < items.GetCount(); ++i) - text[i] = XmStringCreateSimple ((char*)items[i].c_str()); + text[i] = wxStringToXmString (items[i]); if ( clientData ) for (i = 0; i < items.GetCount(); ++i) - m_clientDataList.Append ((long) i, (wxObject *) clientData[i]); + m_clientDataDict.Set(i, (wxClientData*)clientData[i], FALSE); XmListAddItems (listBox, text, items.GetCount(), 0); for (i = 0; i < items.GetCount(); i++) @@ -264,35 +283,24 @@ void wxListBox::DoSetItems(const wxArrayString& items, void** clientData) // 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); + SetSelectionPolicy(); 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); + sk.Restore(); m_noItems = items.GetCount(); } -int wxListBox::FindString(const wxString& s) const +int wxDoFindStringInList(Widget w, const wxString& s) { - XmString str = XmStringCreateSimple ((char*) (const char*) s); + wxXmString str( s ); int *positions = NULL; int no_positions = 0; - bool success = XmListGetMatchPos ((Widget) m_mainWidget, str, + bool success = XmListGetMatchPos (w, str(), &positions, &no_positions); - XmStringFree (str); + if (success) { int pos = positions[0]; @@ -304,24 +312,24 @@ int wxListBox::FindString(const wxString& s) const return -1; } +int wxListBox::FindString(const wxString& s) const +{ + return wxDoFindStringInList( (Widget)m_mainWidget, s ); +} + void wxListBox::Clear() { if (m_noItems <= 0) return; - int width1, height1; - int width2, height2; - + wxSizeKeeper sk( this ); Widget listBox = (Widget) m_mainWidget; - GetSize (&width1, &height1); XmListDeleteAllItems (listBox); - m_clientDataList.Clear (); - GetSize (&width2, &height2); + if( HasClientObjectData() ) + m_clientDataDict.DestroyData(); - // Correct for randomly resized listbox - bad boy, Motif! - if (width1 != width2 || height1 != height2) - SetSize (-1, -1, width1, height1); + sk.Restore(); m_noItems = 0; } @@ -385,30 +393,22 @@ bool wxListBox::IsSelected(int N) const void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData) { - DoSetItemClientData(n, (void*) clientData); + m_clientDataDict.Set(n, clientData, FALSE); } wxClientData* wxListBox::DoGetItemClientObject(int n) const { - return (wxClientData*) DoGetItemClientData(n); + return m_clientDataDict.Get(n); } void *wxListBox::DoGetItemClientData(int N) const { - wxNode *node = m_clientDataList.Find ((long) N); - if (node) - return (void *) node->Data (); - else - return NULL; + return (void*)m_clientDataDict.Get(N); } void wxListBox::DoSetItemClientData(int N, void *Client_data) { - wxNode *node = m_clientDataList.Find ((long) N); - if (node) - node->SetData ((wxObject *)Client_data); - else - node = m_clientDataList.Append((long) N, (wxObject*) Client_data); + m_clientDataDict.Set(N, (wxClientData*)Client_data, FALSE); } // Return number of selections and an array of selected integers @@ -441,9 +441,8 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const } // Get single selection, for single choice list items -int wxListBox::GetSelection() const +int wxDoGetSelectionInList(Widget listBox) { - Widget listBox = (Widget) m_mainWidget; int *posList = NULL; int posCnt = 0; bool flag = XmListGetSelectedPos (listBox, &posList, &posCnt); @@ -459,54 +458,36 @@ int wxListBox::GetSelection() const return -1; } +int wxListBox::GetSelection() const +{ + return wxDoGetSelectionInList((Widget) m_mainWidget); +} + // Find string for position -wxString wxListBox::GetString(int N) const +wxString wxDoGetStringInList( Widget listBox, int n ) { - Widget listBox = (Widget) m_mainWidget; XmString *strlist; - int n; - XtVaGetValues (listBox, XmNitemCount, &n, XmNitems, &strlist, NULL); - if (N <= n && N >= 0) - { - char *txt; - if (XmStringGetLtoR (strlist[N], XmSTRING_DEFAULT_CHARSET, &txt)) - { - wxString str(txt); - XtFree (txt); - return str; - } - else - return wxEmptyString; - } + int count; + XtVaGetValues( listBox, + XmNitemCount, &count, + XmNitems, &strlist, + NULL ); + if( n < count && n >= 0 ) + return wxXmStringToString( strlist[n] ); else return wxEmptyString; } -void wxListBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) +wxString wxListBox::GetString( int n ) const { - wxWindow::DoSetSize(x, y, width, height, sizeFlags); - - // Check resulting size is correct - int tempW, tempH; - GetSize (&tempW, &tempH); - - /* - if (tempW != width || tempH != height) - { - cout << "wxListBox::SetSize sizes not set correctly."); - } - */ + return wxDoGetStringInList( (Widget)m_mainWidget, n ); } void wxListBox::DoInsertItems(const wxArrayString& items, int pos) { - int width1, height1; - int width2, height2; - + wxSizeKeeper sk( this ); Widget listBox = (Widget) m_mainWidget; - GetSize(&width1, &height1); - bool managed = XtIsManaged(listBox); if (managed) @@ -519,12 +500,12 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos) // Corrected by Sergey Krasnov from Steve Hammes' code #if XmVersion > 1001 for (i = 0; i < items.GetCount(); i++) - text[i] = XmStringCreateSimple((char*)items[i].c_str()); + text[i] = wxStringToXmString(items[i]); XmListAddItemsUnselected(listBox, text, items.GetCount(), pos+1); #else for (i = 0; i < items.GetCount(); i++) { - text[i] = XmStringCreateSimple((char*)items[i].c_str()); + text[i] = wxStringToXmString(items[i]); // Another Sergey correction XmListAddItemUnselected(listBox, text[i], pos+i+1); } @@ -535,47 +516,29 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos) // 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) ; + SetSelectionPolicy(); 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); + sk.Restore(); m_noItems += items.GetCount(); } void wxListBox::SetString(int N, const wxString& s) { - int width1, height1; - int width2, height2; - + wxSizeKeeper sk( this ); Widget listBox = (Widget) m_mainWidget; - GetSize (&width1, &height1); - XmString text = XmStringCreateSimple ((char*) (const char*) s); + wxXmString text( s ); // 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); + XmListAddItem (listBox, text(), N+1); - GetSize (&width2, &height2); - // Correct for randomly resized listbox - bad boy, Motif! - if (width1 != width2 || height1 != height2) - SetSize (-1, -1, width1, height1); + sk.Restore(); } void wxListBox::Command (wxCommandEvent & event) @@ -653,11 +616,6 @@ WXWidget wxListBox::GetTopWidget() const return (WXWidget) XtParent( (Widget) m_mainWidget ); } -void wxListBox::ChangeFont(bool keepOriginalSize) -{ - wxWindow::ChangeFont(keepOriginalSize); -} - void wxListBox::ChangeBackgroundColour() { wxWindow::ChangeBackgroundColour(); @@ -674,8 +632,8 @@ void wxListBox::ChangeBackgroundColour() * function to change them (by default, taken from wxSystemSettings) */ wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE); - DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE); + wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE); + wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE); XtVaSetValues (hsb, XmNtroughColor, backgroundColour.AllocColour(XtDisplay(hsb)), @@ -684,7 +642,8 @@ void wxListBox::ChangeBackgroundColour() XmNtroughColor, backgroundColour.AllocColour(XtDisplay(vsb)), NULL); - DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE); + // MBN: why change parent's background? It looks really ugly. + // wxDoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE); } void wxListBox::ChangeForegroundColour() @@ -702,9 +661,9 @@ void wxListBox::ChangeForegroundColour() /* 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); + wxDoChangeForegroundColour((WXWidget) hsb, m_foregroundColour); + wxDoChangeForegroundColour((WXWidget) vsb, m_foregroundColour); + wxDoChangeForegroundColour((WXWidget) parent, m_foregroundColour); */ } @@ -712,3 +671,51 @@ int wxListBox::GetCount() const { return m_noItems; } + +#define LIST_SCROLL_SPACING 6 + +wxSize wxDoGetListBoxBestSize( Widget listWidget, const wxWindow* window ) +{ + int max; + Dimension spacing, highlight, xmargin, ymargin, shadow; + int width = 0; + int x, y; + + XtVaGetValues( listWidget, + XmNitemCount, &max, + XmNlistSpacing, &spacing, + XmNhighlightThickness, &highlight, + XmNlistMarginWidth, &xmargin, + XmNlistMarginHeight, &ymargin, + XmNshadowThickness, &shadow, + NULL ); + + for( size_t i = 0; i < (size_t)max; ++i ) + { + window->GetTextExtent( wxDoGetStringInList( listWidget, i ), &x, &y ); + width = wxMax( width, x ); + } + + // use some arbitrary value if there are no strings + if( width == 0 ) + width = 100; + + // get my + window->GetTextExtent( "v", &x, &y ); + + // make it a little larger than widest string, plus the scrollbar + width += wxSystemSettings::GetMetric( wxSYS_VSCROLL_X ) + + 2 * highlight + LIST_SCROLL_SPACING + 2 * xmargin + 2 * shadow; + + // at least 3 items, at most 10 + int height = wxMax( 3, wxMin( 10, max ) ) * + ( y + spacing + 2 * highlight ) + 2 * ymargin + 2 * shadow; + + return wxSize( width, height ); +} + +wxSize wxListBox::DoGetBestSize() const +{ + return wxDoGetListBoxBestSize( (Widget)m_mainWidget, this ); +} +