X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d120f8391920145647ec10e84629bc21fa9f1bb..31a9fc93900c8f958a4d37b3281e73f7601e6a63:/src/motif/listbox.cpp

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index a31b554ed9..b0ab1011ab 100644
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        listbox.cpp
+// Name:        src/motif/listbox.cpp
 // Purpose:     wxListBox
 // Author:      Julian Smart
 // Modified by:
@@ -9,37 +9,70 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "listbox.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX
 
 #include "wx/listbox.h"
-#include "wx/settings.h"
-#include "wx/dynarray.h"
-#include "wx/log.h"
-#include "wx/utils.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/arrstr.h"
+#endif
+
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/List.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 #include "wx/motif/private.h"
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
-#endif
+static void wxListBoxCallback(Widget w,
+                              XtPointer clientData,
+                              XmListCallbackStruct * cbs);
 
-void wxListBoxCallback (Widget w, XtPointer clientData,
-                        XmListCallbackStruct * cbs);
+// ----------------------------------------------------------------------------
+// wxSizeKeeper
+// ----------------------------------------------------------------------------
 
-void wxListBoxDefaultActionProc (Widget list_w, XtPointer client_data, XmListCallbackStruct * cbs);
+// helper class to reduce code duplication
+class wxSizeKeeper
+{
+    int m_x, m_y;
+    int m_w, m_h;
+    wxWindow* m_wnd;
+public:
+    wxSizeKeeper( wxWindow* w )
+        : m_wnd( w )
+    {
+        m_wnd->GetSize( &m_w, &m_h );
+        m_wnd->GetPosition( &m_x, &m_y );
+    }
+
+    void Restore()
+    {
+        int x, y;
+
+        m_wnd->GetSize( &x, &y );
+        if( x != m_x || y != m_y )
+            m_wnd->SetSize( m_x, m_y, m_w, m_h );
+    }
+};
 
 // ============================================================================
 // list box control implementation
 // ============================================================================
 
 // Listbox item
-wxListBox::wxListBox(): m_clientDataList(wxKEY_INTEGER)
+wxListBox::wxListBox()
 {
     m_noItems = 0;
-    m_selected = 0;
 }
 
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,
@@ -50,401 +83,231 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxValidator& validator,
                        const wxString& name)
 {
-    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;
-    
+    if( !wxControl::CreateControl( parent, id, pos, size, style,
+                                   validator, name ) )
+        return false;
+    PreCreation();
+
+    m_noItems = (unsigned int)n;
+
     Widget parentWidget = (Widget) parent->GetClientWidget();
-    
-    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)
+    Display* dpy = XtDisplay(parentWidget);
+
+    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( m_font.Ok() )
     {
-        XtSetArg (args[2], XmNscrollBarDisplayPolicy, XmSTATIC);
-        count = 3;
+        XtSetArg( args[count],
+                  (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy) );
+        ++count;
     }
-    else
-        count = 2;
-    
-    Widget listWidget = XmCreateScrolledList (parentWidget, (char*) (const char*) name, args, count);
-    
+    if( m_windowStyle & wxLB_ALWAYS_SB )
+    {
+        XtSetArg( args[count], XmNscrollBarDisplayPolicy, XmSTATIC );
+        ++count;
+    }
+
+    Widget listWidget =
+        XmCreateScrolledList(parentWidget,
+                             name.char_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();
-    ChangeFont(FALSE);
-    
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, width, height);
-    
-    ChangeBackgroundColour();
-    
-    return TRUE;
+
+    wxSize best = GetBestSize();
+    if( size.x != -1 ) best.x = size.x;
+    if( size.y != -1 ) best.y = size.y;
+
+    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);
+
+    PostCreation();
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, best.x, best.y);
+
+    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()
+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::SetFirstItem(int N)
+void wxListBox::DoSetFirstItem( int N )
 {
     int count, length;
-    
-    if (N < 0)
+
+    if (!IsValid(N))
         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();
-    }
-    
-    m_noItems --;
-}
-
-void wxListBox::Append(const wxString& item)
+void wxListBox::DoDeleteOneItem(unsigned int n)
 {
-    int width1, height1;
-    int width2, height2;
-    
     Widget listBox = (Widget) m_mainWidget;
-    GetSize (&width1, &height1);
-    
-    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);
-    
-    // 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);
-    
-    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::Append(const wxString& item, char *clientData)
-{
-    int width1, height1;
-    int width2, height2;
-    
-    Widget listBox = (Widget) m_mainWidget;
-    
-    GetSize (&width1, &height1);
-    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);
-    
-    // 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);
-    
-    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 ++;
-}
+    XmListDeletePos (listBox, n + 1);
 
-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; i<n; i++)
-        {
-        XmString text = XmStringCreateSimple(choices[i]);
-        XmListAddItemUnselected(listBox, text, 0);
-        XmStringFree(text);
-        }
-    ***/
-    XmString *text = new XmString[n];
-    int i;
-    for (i = 0; i < n; i++)
-        text[i] = XmStringCreateSimple ((char*) (const char*) choices[i]);
-    
-    if ( clientData )
-        for (i = 0; i < n; i++)
-            m_clientDataList.Append ((long) i, (wxObject *) clientData[i]);
-        
-        XmListAddItems (listBox, text, n, 0);
-        for (i = 0; i < n; i++)
-            XmStringFree (text[i]);
-        delete[]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);
-        
-        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 = n;
+    wxListBoxBase::DoDeleteOneItem(n);
+    m_noItems --;
 }
 
-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, &positions, &no_positions);
-    XmStringFree (str);
-    if (success)
+    bool success = XmListGetMatchPos (w, str(),
+                                      &positions, &no_positions);
+
+    if (success && positions)
     {
         int pos = positions[0];
-        if (positions)
-            XtFree ((char *) positions);
+        XtFree ((char *) positions);
         return pos - 1;
     }
     else
         return -1;
 }
 
-void wxListBox::Clear()
+int wxListBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const
 {
-    if (m_noItems <= 0)
+    // FIXME: back to base class for not supported value of bCase
+
+    return wxDoFindStringInList( (Widget)m_mainWidget, s );
+}
+
+void wxListBox::DoClear()
+{
+    if (!m_noItems)
         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);
-    
-    // Correct for randomly resized listbox - bad boy, Motif!
-    if (width1 != width2 || height1 != height2)
-        SetSize (-1, -1, width1, height1);
-    
+
+    sk.Restore();
+
+    wxListBoxBase::DoClear();
     m_noItems = 0;
 }
 
-void wxListBox::SetSelection(int N, bool select)
+void wxListBox::DoSetSelection(int N, bool select)
 {
-    m_inSetValue = TRUE;
+    m_inSetValue = true;
     if (select)
     {
-    /*
-    if (m_windowStyle & wxLB_MULTIPLE)
-    {
-    int *selections = NULL;
-    int n = GetSelections (&selections);
-    
-      // This hack is supposed to work, to make it possible to select more
-      // than one item, but it DOESN'T under Motif 1.1.
-      
-        XtVaSetValues ((Widget) m_mainWidget, XmNselectionPolicy, XmMULTIPLE_SELECT, NULL);
-        
-          int i;
-          for (i = 0; i < n; i++)
-          XmListSelectPos ((Widget) m_mainWidget, selections[i] + 1, FALSE);
-          
-            XmListSelectPos ((Widget) m_mainWidget, N + 1, FALSE);
-            
-              XtVaSetValues ((Widget) m_mainWidget, XmNselectionPolicy, XmEXTENDED_SELECT, NULL);
-              }
-              else
-        */
-        XmListSelectPos ((Widget) m_mainWidget, N + 1, FALSE);
-        
+#if 0
+        if (m_windowStyle & wxLB_MULTIPLE)
+        {
+            int *selections = NULL;
+            int n = GetSelections (&selections);
+
+            // This hack is supposed to work, to make it possible
+            // to select more than one item, but it DOESN'T under Motif 1.1.
+
+            XtVaSetValues ((Widget) m_mainWidget,
+                           XmNselectionPolicy, XmMULTIPLE_SELECT,
+                           NULL);
+
+            int i;
+            for (i = 0; i < n; i++)
+                XmListSelectPos ((Widget) m_mainWidget,
+                                 selections[i] + 1, False);
+
+            XmListSelectPos ((Widget) m_mainWidget, N + 1, False);
+
+            XtVaSetValues ((Widget) m_mainWidget,
+                           XmNselectionPolicy, XmEXTENDED_SELECT,
+                           NULL);
+        }
+        else
+#endif // 0
+            XmListSelectPos ((Widget) m_mainWidget, N + 1, False);
+
     }
     else
         XmListDeselectPos ((Widget) m_mainWidget, N + 1);
-    
-    m_inSetValue = FALSE;
+
+    m_inSetValue = false;
 }
 
-bool wxListBox::Selected(int N) const
+bool wxListBox::IsSelected(int N) const
 {
     // In Motif, no simple way to determine if the item is selected.
     wxArrayInt theSelections;
     int count = GetSelections (theSelections);
     if (count == 0)
-        return FALSE;
+        return false;
     else
     {
         int j;
         for (j = 0; j < count; j++)
             if (theSelections[j] == N)
-                return TRUE;
+                return true;
     }
-    return FALSE;
-}
-
-void wxListBox::Deselect(int N)
-{
-    XmListDeselectPos ((Widget) m_mainWidget, N + 1);
-}
-
-char *wxListBox::GetClientData(int N) const
-{
-    wxNode *node = m_clientDataList.Find ((long) N);
-    if (node)
-        return (char *) node->Data ();
-    else
-        return NULL;
-}
-
-void wxListBox::SetClientData(int N, char *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);
+    return false;
 }
 
 // Return number of selections and an array of selected integers
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
     aSelections.Empty();
-    
+
     Widget listBox = (Widget) m_mainWidget;
     int *posList = NULL;
     int posCnt = 0;
@@ -454,11 +317,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;
         }
@@ -470,9 +333,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);
@@ -488,304 +350,261 @@ 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::SetSize(int x, int y, int width, int height, int sizeFlags)
+wxString wxListBox::GetString(unsigned int n) const
 {
-    wxWindow::SetSize(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::InsertItems(int nItems, const wxString items[], int pos)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
+                             unsigned int pos,
+                             void **clientData, wxClientDataType type)
 {
-    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;
-    // Steve Hammes: Motif 1.1 compatibility
-    // #if XmVersion > 1100
-    // Corrected by Sergey Krasnov from Steve Hammes' code
+
+    const unsigned int numItems = items.GetCount();
+
+    XmString *text = new XmString[numItems];
+    unsigned int i;
 #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 < numItems; i++)
+    {
+        text[i] = wxStringToXmString(items[i]);
+    }
+    XmListAddItemsUnselected(listBox, text, numItems, GetMotifPosition(pos));
+    InsertNewItemsClientData(pos, numItems, clientData, type);
 #else
-    for (i = 0; i < nItems; i++)
+    AllocClientData(numItems);
+
+    unsigned int idx = pos;
+    for ( i = 0; i < numItems; i++, idx++ )
     {
-        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] = wxStringToXmString(items[i]);
+        XmListAddItemUnselected(listBox, text[i], GetMotifPosition(idx));
+        InsertNewItemClientData(idx, clientData, i, type);
     }
 #endif
-    for (i = 0; i < nItems; i++)
+    for (i = 0; i < numItems; i++)
         XmStringFree(text[i]);
-    
     delete[] 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) ;
-    
-    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 += numItems;
+
+    SetSelectionPolicy();
+
+    return pos + numItems - 1;
 }
 
-void wxListBox::SetString(int N, const wxString& s)
+void wxListBox::SetString(unsigned 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);
-    
-    // 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.
-    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;
-}
+    wxXmString text( s );
 
-// For single selection items only
-wxString wxListBox::GetStringSelection () const
-{
-    int sel = GetSelection ();
-    if (sel > -1)
-        return this->GetString (sel);
-    else
-        return wxString("");
-}
+    // 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);
 
-bool wxListBox::SetStringSelection (const wxString& s, bool flag)
-{
-    int sel = FindString (s);
-    if (sel > -1)
-    {
-        SetSelection (sel, flag);
-        return TRUE;
-    }
-    else
-        return FALSE;
+    sk.Restore();
 }
 
 void wxListBox::Command (wxCommandEvent & event)
 {
-    if (event.m_extraLong)
-        SetSelection (event.m_commandInt);
+    if (event.GetExtraLong())
+        SetSelection (event.GetInt());
     else
     {
-        Deselect (event.m_commandInt);
+        Deselect (event.GetInt());
         return;
     }
     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.SetInt(n);
+    event.SetExtraLong(true);
+    event.SetEventObject(item);
+    event.SetString( item->GetString( n ) );
+
+    int x = -1;
+    if( NULL != cbs->event && 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->HandleWindowEvent(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->HandleWindowEvent(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 );
 }
 
-void wxListBox::ChangeFont(bool keepOriginalSize)
-{
-    wxWindow::ChangeFont(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)
+
+   /* 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);
-    DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
-    DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
-    
-    DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
+    wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+    wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, true);
+    wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, true);
+
+    XtVaSetValues (hsb,
+        XmNtroughColor, backgroundColour.AllocColour(XtDisplay(hsb)),
+        NULL);
+    XtVaSetValues (vsb,
+        XmNtroughColor, backgroundColour.AllocColour(XtDisplay(vsb)),
+        NULL);
+
+    // MBN: why change parent's background? It looks really ugly.
+    // wxDoChangeBackgroundColour((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)
-        DoChangeForegroundColour((WXWidget) hsb, m_foregroundColour);
-        DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
-        DoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
+
+    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)
+
+        wxDoChangeForegroundColour((WXWidget) hsb, m_foregroundColour);
+        wxDoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
+        wxDoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
     */
 }
 
+unsigned 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 );
+}
 
+#endif // wxUSE_LISTBOX