Added support for compiling with wxUSE_STL set to 1.

[wxWidgets.git] / src / motif / listbox.cpp

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 25fbfdf546a1bfc0b725b7ec56617e8539bfae9b..47016d85bccb1b9d7ef161bfd2c0831feb30e06d 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -9,40 +9,74 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "listbox.h"
 #endif
 
     #pragma implementation "listbox.h"
 #endif
 

-#include "wx/listbox.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.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"
 #include "wx/settings.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 #include "wx/utils.h"

+#include "wx/arrstr.h"

 
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/List.h>
 #include <Xm/List.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 #include "wx/motif/private.h"
 
 #include "wx/motif/private.h"
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
     IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)

-#endif

 
 static void wxListBoxCallback(Widget w,
                               XtPointer clientData,
                               XmListCallbackStruct * cbs);
 
 
 static void wxListBoxCallback(Widget w,
                               XtPointer clientData,
                               XmListCallbackStruct * cbs);
 

-static void wxListBoxDefaultActionProc(Widget list_w,
-                                XtPointer client_data,
-                                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
 
 // ============================================================================
 // list box control implementation
 // ============================================================================
 
 // Listbox item

-wxListBox::wxListBox() : m_clientDataList(wxKEY_INTEGER)
+wxListBox::wxListBox()

 {
     m_noItems = 0;
 {
     m_noItems = 0;

-    m_selected = 0;

 }
 
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,


@@ -53,40 +87,44 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxValidator& validator,
                        const wxString& name)
 {
                        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_noItems = n;

-    m_selected = 0;
-    //    m_backgroundColour = parent->GetBackgroundColour();

     m_backgroundColour = * wxWHITE;
     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*) (const char*) name, args, count);
+    Widget listWidget =
+        XmCreateScrolledList(parentWidget,
+                             wxConstCast(name.c_str(), char), args, count);

 
     m_mainWidget = (WXWidget) listWidget;
 
 
     m_mainWidget = (WXWidget) listWidget;
 


@@ -94,39 +132,70 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
     XtManageChild (listWidget);
 
 
     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_font = parent->GetFont();
-    ChangeFont(FALSE);
-
-    SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, width, height);
+    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);
+
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, best.x, best.y);

 
     ChangeBackgroundColour();
 
     return TRUE;
 }
 
 
     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()
 {
 wxListBox::~wxListBox()
 {

+    if( HasClientObjectData() )
+        m_clientDataDict.DestroyData();

 }
 
 }
 

-void wxListBox::SetFirstItem(int N)
+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 )

 {
     int count, length;
 
 {
     int count, length;
 


@@ -141,20 +210,10 @@ void wxListBox::SetFirstItem(int N)
     XmListSetPos ((Widget) m_mainWidget, N + 1);
 }
 
     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)
 {
 void wxListBox::Delete(int N)
 {

-    int width1, height1;
-    int width2, height2;
+    wxSizeKeeper sk( this );

     Widget listBox = (Widget) m_mainWidget;
     Widget listBox = (Widget) m_mainWidget;

-    GetSize (&width1, &height1);

 
     bool managed = XtIsManaged(listBox);
 
 
     bool managed = XtIsManaged(listBox);
 


@@ -166,32 +225,15 @@ void wxListBox::Delete(int N)
     if (managed)
         XtManageChild (listBox);
 
     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();
-    }
-
+    sk.Restore();
+    m_clientDataDict.Delete(N, HasClientObjectData());

     m_noItems --;
 }
 
     m_noItems --;
 }
 

-void wxListBox::Append(const wxString& item)
+int wxListBox::DoAppend(const wxString& item)

 {
 {

-    int width1, height1;
-    int width2, height2;
-
+    wxSizeKeeper sk( this );

     Widget listBox = (Widget) m_mainWidget;
     Widget listBox = (Widget) m_mainWidget;

-    GetSize (&width1, &height1);

 
     bool managed = XtIsManaged(listBox);
 
 
     bool managed = XtIsManaged(listBox);
 


@@ -199,144 +241,69 @@ void wxListBox::Append(const wxString& item)
         XtUnmanageChild (listBox);
     int n;
     XtVaGetValues (listBox, XmNitemCount, &n, NULL);
         XtUnmanageChild (listBox);
     int n;
     XtVaGetValues (listBox, XmNitemCount, &n, NULL);

-    XmString text = XmStringCreateSimple ((char*) (const char*) item);
+    wxXmString text( item );

     //  XmListAddItem(listBox, text, n + 1);
     //  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!!
 
     // 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);
 
 
     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 ++;
     m_noItems ++;

+
+    return GetCount() - 1;

 }
 
 }
 

-void wxListBox::Append(const wxString& item, void *clientData)
+void wxListBox::DoSetItems(const wxArrayString& items, void** clientData)

 {
 {

-    int width1, height1;
-    int width2, height2;
-
+    wxSizeKeeper sk( this );

     Widget listBox = (Widget) m_mainWidget;
 
     Widget listBox = (Widget) m_mainWidget;
 

-    GetSize (&width1, &height1);
-    Bool managed = XtIsManaged(listBox);
+    if( HasClientObjectData() )
+        m_clientDataDict.DestroyData();
+
+    bool managed = XtIsManaged(listBox);

 
     if (managed)
         XtUnmanageChild (listBox);
 
     if (managed)
         XtUnmanageChild (listBox);

+    XmString *text = new XmString[items.GetCount()];
+    size_t i;
+    for (i = 0; i < items.GetCount(); ++i)
+        text[i] = wxStringToXmString (items[i]);

 
 

-    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);
+    if ( clientData )
+        for (i = 0; i < items.GetCount(); ++i)
+            m_clientDataDict.Set(i, (wxClientData*)clientData[i], FALSE);
+
+    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!!
 
     // 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);
+    SetSelectionPolicy();

 
     if (managed)
         XtManageChild (listBox);
 
 
     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, void** 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);
+    sk.Restore();

 
 

-        GetSize (&width2, &height2);
-        // Correct for randomly resized listbox - bad boy, Motif!
-        if (width1 != width2 || height1 != height2)
-            SetSize (-1, -1, width1, height1);
-
-        m_noItems = n;
+    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;
     int *positions = NULL;
     int no_positions = 0;

-    bool success = XmListGetMatchPos ((Widget) m_mainWidget, str, &positions, &no_positions);
-    XmStringFree (str);
+    bool success = XmListGetMatchPos (w, str(),
+                                      &positions, &no_positions);
+

     if (success)
     {
         int pos = positions[0];
     if (success)
     {
         int pos = positions[0];


@@ -348,24 +315,24 @@ int wxListBox::FindString(const wxString& s) const
         return -1;
 }
 
         return -1;
 }
 

+int wxListBox::FindString(const wxString& s) const
+{
+    return wxDoFindStringInList( (Widget)m_mainWidget, s );
+}
+

 void wxListBox::Clear()
 {
     if (m_noItems <= 0)
         return;
 
 void wxListBox::Clear()
 {
     if (m_noItems <= 0)
         return;
 

-    int width1, height1;
-    int width2, height2;
-
+    wxSizeKeeper sk( this );

     Widget listBox = (Widget) m_mainWidget;
     Widget listBox = (Widget) m_mainWidget;

-    GetSize (&width1, &height1);

 
     XmListDeleteAllItems (listBox);
 
     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;
 }
 
     m_noItems = 0;
 }


@@ -381,18 +348,23 @@ void wxListBox::SetSelection(int N, bool select)
             int *selections = NULL;
             int n = GetSelections (&selections);
 
             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.
+            // 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);
+            XtVaSetValues ((Widget) m_mainWidget,
+                           XmNselectionPolicy, XmMULTIPLE_SELECT,
+                           NULL);

 
             int i;
             for (i = 0; i < n; i++)
 
             int i;
             for (i = 0; i < n; i++)

-                XmListSelectPos ((Widget) m_mainWidget, selections[i] + 1, FALSE);
+                XmListSelectPos ((Widget) m_mainWidget,
+                                 selections[i] + 1, FALSE);

 
             XmListSelectPos ((Widget) m_mainWidget, N + 1, FALSE);
 
 
             XmListSelectPos ((Widget) m_mainWidget, N + 1, FALSE);
 

-            XtVaSetValues ((Widget) m_mainWidget, XmNselectionPolicy, XmEXTENDED_SELECT, NULL);
+            XtVaSetValues ((Widget) m_mainWidget,
+                           XmNselectionPolicy, XmEXTENDED_SELECT,
+                           NULL);

         }
         else
 #endif // 0
         }
         else
 #endif // 0


@@ -405,7 +377,7 @@ void wxListBox::SetSelection(int N, bool select)
     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;
 {
     // In Motif, no simple way to determine if the item is selected.
     wxArrayInt theSelections;


@@ -422,27 +394,24 @@ bool wxListBox::Selected(int N) const
     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxListBox::Deselect(int N)
+void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)

 {
 {

-    XmListDeselectPos ((Widget) m_mainWidget, N + 1);
+    m_clientDataDict.Set(n, clientData, FALSE);

 }
 
 }
 

-void *wxListBox::GetClientData(int N) const
+wxClientData* wxListBox::DoGetItemClientObject(int n) const

 {
 {

-    wxNode *node = m_clientDataList.Find ((long) N);
-    if (node)
-        return (void *) node->Data ();
-    else
-        return NULL;
+    return m_clientDataDict.Get(n);

 }
 
 }
 

-void wxListBox::SetClientData(int N, void *Client_data)
+void *wxListBox::DoGetItemClientData(int N) const

 {
 {

-    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 (void*)m_clientDataDict.Get(N);
+}
+
+void wxListBox::DoSetItemClientData(int N, void *Client_data)
+{
+    m_clientDataDict.Set(N, (wxClientData*)Client_data, FALSE);

 }
 
 // Return number of selections and an array of selected integers
 }
 
 // Return number of selections and an array of selected integers


@@ -475,9 +444,8 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
 }
 
 // Get single selection, for single choice list items
 }
 
 // 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);
     int *posList = NULL;
     int posCnt = 0;
     bool flag = XmListGetSelectedPos (listBox, &posList, &posCnt);


@@ -493,152 +461,87 @@ int wxListBox::GetSelection() const
         return -1;
 }
 
         return -1;
 }
 

+int wxListBox::GetSelection() const
+{
+    return wxDoGetSelectionInList((Widget) m_mainWidget);
+}
+

 // Find string for position
 // Find string for position

-wxString wxListBox::GetString(int N) const
+wxString wxDoGetStringInList( Widget listBox, int n )

 {
 {

-    Widget listBox = (Widget) m_mainWidget;

     XmString *strlist;
     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;
 }
 
     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::InsertItems(int nItems, const wxString items[], int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, int pos)

 {
 {

-    int width1, height1;
-    int width2, height2;
-
+    wxSizeKeeper sk( this );

     Widget listBox = (Widget) m_mainWidget;
 
     Widget listBox = (Widget) m_mainWidget;
 

-    GetSize(&width1, &height1);
-

     bool managed = XtIsManaged(listBox);
 
     if (managed)
         XtUnmanageChild(listBox);
 
     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
     // 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] = wxStringToXmString(items[i]);
+    XmListAddItemsUnselected(listBox, text, items.GetCount(), pos+1);

 #else
 #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] = wxStringToXmString(items[i]);
+        // Another Sergey correction
+        XmListAddItemUnselected(listBox, text[i], pos+i+1);

     }
 #endif
     }
 #endif

-    for (i = 0; i < nItems; i++)
+    for (i = 0; i < items.GetCount(); i++)

         XmStringFree(text[i]);
         XmStringFree(text[i]);

-

     delete[] text;
 
     // It seems that if the list is cleared, we must re-ask for
     // selection policy!!
     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) ;
+    SetSelectionPolicy();

 
     if (managed)
         XtManageChild(listBox);
 
 
     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 += nItems;
+    m_noItems += items.GetCount();

 }
 
 void wxListBox::SetString(int N, const wxString& s)
 {
 }
 
 void wxListBox::SetString(int N, const wxString& s)
 {

-    int width1, height1;
-    int width2, height2;
-
+    wxSizeKeeper sk( this );

     Widget listBox = (Widget) m_mainWidget;
     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);
 
     // 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);
-
-    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
-{
-    wxString res;
-    int sel = GetSelection();
-    if (sel > -1)
-        res = GetString(sel);
+    XmListAddItem (listBox, text(), N+1);

 
 

-    return res;
-}
-
-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)
 }
 
 void wxListBox::Command (wxCommandEvent & event)


@@ -656,86 +559,66 @@ void wxListBox::Command (wxCommandEvent & event)
 void wxListBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
                         XmListCallbackStruct * cbs)
 {
 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;
 
     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( 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:
     switch (cbs->reason)
     {
     case XmCR_MULTIPLE_SELECT:
     case XmCR_BROWSE_SELECT:

-        {
-            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;
-        }
+#if wxUSE_CHECKLISTBOX
+        item->DoToggleItem( n, x );
+#endif
+    case XmCR_DEFAULT_ACTION:
+        item->GetEventHandler()->ProcessEvent(event);
+        break;

     case XmCR_EXTENDED_SELECT:
     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;
         }

+        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 WXUNUSED(list_w), XtPointer client_data, XmListCallbackStruct * WXUNUSED(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 );
 }
 
 WXWidget wxListBox::GetTopWidget() const
 {
     return (WXWidget) XtParent( (Widget) m_mainWidget );
 }
 

-void wxListBox::ChangeFont(bool keepOriginalSize)
-{
-    wxWindow::ChangeFont(keepOriginalSize);
-}
-

 void wxListBox::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 void wxListBox::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();


@@ -751,9 +634,9 @@ void wxListBox::ChangeBackgroundColour()
    /* 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);
+    wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+    wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
+    wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);

 
     XtVaSetValues (hsb,
         XmNtroughColor, backgroundColour.AllocColour(XtDisplay(hsb)),
 
     XtVaSetValues (hsb,
         XmNtroughColor, backgroundColour.AllocColour(XtDisplay(hsb)),


@@ -762,7 +645,8 @@ void wxListBox::ChangeBackgroundColour()
         XmNtroughColor, backgroundColour.AllocColour(XtDisplay(vsb)),
         NULL);
 
         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()
 }
 
 void wxListBox::ChangeForegroundColour()


@@ -780,10 +664,61 @@ void wxListBox::ChangeForegroundColour()
     /* 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)
 

-        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);

     */
 }
 
     */
 }
 

+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 );
+}