compilation fix: wxcrt.h, not crt.h

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

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 1b2a48a223631b327322cf30d69a0204b9a732d2..74b891b29388a5a5e0281636848da8cfe610c5ae 100644 (file)
--- 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:
 // Purpose:     wxListBox
 // Author:      Julian Smart
 // Modified by:


@@ -9,8 +9,19 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "listbox.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX
+
+#include "wx/listbox.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
 #endif
 
 #ifdef __VMS


@@ -18,12 +29,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
 #define XtDisplay XTDISPLAY
 #endif
 

-# include "wx/listbox.h"
-#include "wx/settings.h"
-#include "wx/dynarray.h"
-#include "wx/log.h"
-#include "wx/utils.h"
-

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


@@ -47,21 +52,23 @@ static void wxListBoxCallback(Widget w,
 class wxSizeKeeper
 {
     int m_x, m_y;
 class wxSizeKeeper
 {
     int m_x, m_y;

-    wxWindow* m_w;
+    int m_w, m_h;
+    wxWindow* m_wnd;

 public:
     wxSizeKeeper( wxWindow* w )
 public:
     wxSizeKeeper( wxWindow* w )

-        : m_w( w )
+        : m_wnd( w )

     {
     {

-        m_w->GetSize( &m_x, &m_y );
+        m_wnd->GetSize( &m_w, &m_h );
+        m_wnd->GetPosition( &m_x, &m_y );

     }
 
     void Restore()
     {
         int x, y;
 
     }
 
     void Restore()
     {
         int x, y;
 

-        m_w->GetSize( &x, &y );
+        m_wnd->GetSize( &x, &y );

         if( x != m_x || y != m_y )
         if( x != m_x || y != m_y )

-            m_w->SetSize( -1, -1, m_x, m_y );
+            m_wnd->SetSize( m_x, m_y, m_w, m_h );

     }
 };
 
     }
 };
 


@@ -85,29 +92,37 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 {
     if( !wxControl::CreateControl( parent, id, pos, size, style,
                                    validator, name ) )
 {
     if( !wxControl::CreateControl( parent, id, pos, size, style,
                                    validator, name ) )

-        return FALSE;
+        return false;
+    PreCreation();

 
 

-    m_noItems = n;
-    m_backgroundColour = * wxWHITE;
+    m_noItems = (unsigned int)n;

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Widget parentWidget = (Widget) parent->GetClientWidget();

+    Display* dpy = XtDisplay(parentWidget);

 
 

-    Arg args[3];
+    Arg args[4];

     int count = 0;
     int count = 0;

-    XtSetArg( args[0], XmNlistSizePolicy, XmCONSTANT ); ++count;
-    XtSetArg( args[1], XmNselectionPolicy,
+    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;
               ( m_windowStyle & wxLB_MULTIPLE ) ? XmMULTIPLE_SELECT :
               ( m_windowStyle & wxLB_EXTENDED ) ? XmEXTENDED_SELECT :
                                                   XmBROWSE_SELECT );
     ++count;

+    if( m_font.Ok() )
+    {
+        XtSetArg( args[count],
+                  (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy) );
+        ++count;
+    }

     if( m_windowStyle & wxLB_ALWAYS_SB )
     {
     if( m_windowStyle & wxLB_ALWAYS_SB )
     {

-        XtSetArg( args[2], XmNscrollBarDisplayPolicy, XmSTATIC );
+        XtSetArg( args[count], XmNscrollBarDisplayPolicy, XmSTATIC );

         ++count;
     }
 
         ++count;
     }
 

-    Widget listWidget = XmCreateScrolledList(parentWidget,
-                                             (char*)name.c_str(), args, count);
+    Widget listWidget =
+        XmCreateScrolledList(parentWidget,
+                             wxConstCast(name.mb_str(), char), args, count);

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


@@ -115,12 +130,9 @@ 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;
+    wxSize best = GetBestSize();
+    if( size.x != -1 ) best.x = size.x;
+    if( size.y != -1 ) best.y = size.y;

 
     XtAddCallback (listWidget,
                    XmNbrowseSelectionCallback,
 
     XtAddCallback (listWidget,
                    XmNbrowseSelectionCallback,


@@ -139,15 +151,24 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                    (XtCallbackProc) wxListBoxCallback,
                    (XtPointer) this);
 
                    (XtCallbackProc) wxListBoxCallback,
                    (XtPointer) this);
 

-    ChangeFont(FALSE);
-
-    SetCanAddEventHandler(TRUE);
+    PostCreation();

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,

-                  pos.x, pos.y, width, height);
+                  pos.x, pos.y, best.x, best.y);

 
 

-    ChangeBackgroundColour();
+    return true;
+}

 
 

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


@@ -175,8 +196,9 @@ void wxListBox::DoSetFirstItem( int N )
 {
     int count, length;
 
 {
     int count, length;
 

-    if (N < 0)
+    if (!IsValid(N))

         return;
         return;

+

     XtVaGetValues ((Widget) m_mainWidget,
                     XmNvisibleItemCount, &count,
                     XmNitemCount, &length,
     XtVaGetValues ((Widget) m_mainWidget,
                     XmNvisibleItemCount, &count,
                     XmNitemCount, &length,


@@ -186,35 +208,20 @@ void wxListBox::DoSetFirstItem( int N )
     XmListSetPos ((Widget) m_mainWidget, N + 1);
 }
 
     XmListSetPos ((Widget) m_mainWidget, N + 1);
 }
 

-void wxListBox::Delete(int N)
+void wxListBox::Delete(unsigned int n)

 {
 {

-    wxSizeKeeper sk( this );

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

-    bool managed = XtIsManaged(listBox);
-
-    if (managed)
-        XtUnmanageChild (listBox);
-
-    XmListDeletePos (listBox, N + 1);
+    XmListDeletePos (listBox, n + 1);

 
 

-    if (managed)
-        XtManageChild (listBox);
-
-    sk.Restore();
-    m_clientDataDict.Delete(N, HasClientObjectData());
+    m_clientDataDict.Delete(n, HasClientObjectData());

     m_noItems --;
 }
 
 int wxListBox::DoAppend(const wxString& item)
 {
     m_noItems --;
 }
 
 int wxListBox::DoAppend(const wxString& item)
 {

-    wxSizeKeeper sk( this );

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

-    bool managed = XtIsManaged(listBox);
-
-    if (managed)
-        XtUnmanageChild (listBox);

     int n;
     XtVaGetValues (listBox, XmNitemCount, &n, NULL);
     wxXmString text( item );
     int n;
     XtVaGetValues (listBox, XmNitemCount, &n, NULL);
     wxXmString text( item );


@@ -225,10 +232,6 @@ int wxListBox::DoAppend(const wxString& item)
     // selection policy!!
     SetSelectionPolicy();
 
     // selection policy!!
     SetSelectionPolicy();
 

-    if (managed)
-        XtManageChild (listBox);
-
-    sk.Restore();

     m_noItems ++;
 
     return GetCount() - 1;
     m_noItems ++;
 
     return GetCount() - 1;


@@ -236,24 +239,19 @@ int wxListBox::DoAppend(const wxString& item)
 
 void wxListBox::DoSetItems(const wxArrayString& items, void** clientData)
 {
 
 void wxListBox::DoSetItems(const wxArrayString& items, void** clientData)
 {

-    wxSizeKeeper sk( this );

     Widget listBox = (Widget) m_mainWidget;
 
     if( HasClientObjectData() )
         m_clientDataDict.DestroyData();
 
     Widget listBox = (Widget) m_mainWidget;
 
     if( HasClientObjectData() )
         m_clientDataDict.DestroyData();
 

-    bool managed = XtIsManaged(listBox);
-
-    if (managed)
-        XtUnmanageChild (listBox);

     XmString *text = new XmString[items.GetCount()];
     XmString *text = new XmString[items.GetCount()];

-    size_t i;
+    unsigned int i;

     for (i = 0; i < items.GetCount(); ++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)
 
     if ( clientData )
         for (i = 0; i < items.GetCount(); ++i)

-            m_clientDataDict.Set(i, (wxClientData*)clientData[i], FALSE);
+            m_clientDataDict.Set(i, (wxClientData*)clientData[i], false);

 
     XmListAddItems (listBox, text, items.GetCount(), 0);
     for (i = 0; i < items.GetCount(); i++)
 
     XmListAddItems (listBox, text, items.GetCount(), 0);
     for (i = 0; i < items.GetCount(); i++)


@@ -264,33 +262,34 @@ void wxListBox::DoSetItems(const wxArrayString& items, void** clientData)
     // selection policy!!
     SetSelectionPolicy();
 
     // selection policy!!
     SetSelectionPolicy();
 

-    if (managed)
-        XtManageChild (listBox);
-
-    sk.Restore();
-

     m_noItems = items.GetCount();
 }
 
     m_noItems = items.GetCount();
 }
 

-int wxListBox::FindString(const wxString& s) const
+int wxDoFindStringInList(Widget w, const wxString& s)

 {
     wxXmString str( s );
     int *positions = NULL;
     int no_positions = 0;
 {
     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);
 
                                       &positions, &no_positions);
 

-    if (success)
+    if (success && positions)

     {
         int pos = positions[0];
     {
         int pos = positions[0];

-        if (positions)
-            XtFree ((char *) positions);
+        XtFree ((char *) positions);

         return pos - 1;
     }
     else
         return -1;
 }
 
         return pos - 1;
     }
     else
         return -1;
 }
 

+int wxListBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const
+{
+    // FIXME: back to base class for not supported value of bCase
+
+    return wxDoFindStringInList( (Widget)m_mainWidget, s );
+}
+

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


@@ -308,9 +307,9 @@ void wxListBox::Clear()
     m_noItems = 0;
 }
 
     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 0
     if (select)
     {
 #if 0


@@ -329,9 +328,9 @@ void wxListBox::SetSelection(int N, bool select)
             int i;
             for (i = 0; i < n; i++)
                 XmListSelectPos ((Widget) m_mainWidget,
             int i;
             for (i = 0; i < n; i++)
                 XmListSelectPos ((Widget) m_mainWidget,

-                                 selections[i] + 1, FALSE);
+                                 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,
 
             XtVaSetValues ((Widget) m_mainWidget,
                            XmNselectionPolicy, XmEXTENDED_SELECT,


@@ -339,13 +338,13 @@ void wxListBox::SetSelection(int N, bool select)
         }
         else
 #endif // 0
         }
         else
 #endif // 0

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

 
     }
     else
         XmListDeselectPos ((Widget) m_mainWidget, N + 1);
 
 
     }
     else
         XmListDeselectPos ((Widget) m_mainWidget, N + 1);
 

-    m_inSetValue = FALSE;
+    m_inSetValue = false;

 }
 
 bool wxListBox::IsSelected(int N) const
 }
 
 bool wxListBox::IsSelected(int N) const


@@ -354,35 +353,35 @@ bool wxListBox::IsSelected(int N) const
     wxArrayInt theSelections;
     int count = GetSelections (theSelections);
     if (count == 0)
     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)
     else
     {
         int j;
         for (j = 0; j < count; j++)
             if (theSelections[j] == N)

-                return TRUE;
+                return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 }
 

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

 {
 {

-    m_clientDataDict.Set(n, clientData, FALSE);
+    m_clientDataDict.Set(n, clientData, false);

 }
 
 }
 

-wxClientData* wxListBox::DoGetItemClientObject(int n) const
+wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const

 {
     return m_clientDataDict.Get(n);
 }
 
 {
     return m_clientDataDict.Get(n);
 }
 

-void *wxListBox::DoGetItemClientData(int N) const
+void *wxListBox::DoGetItemClientData(unsigned int n) const

 {
 {

-    return (void*)m_clientDataDict.Get(N);
+    return (void*)m_clientDataDict.Get(n);

 }
 
 }
 

-void wxListBox::DoSetItemClientData(int N, void *Client_data)
+void wxListBox::DoSetItemClientData(unsigned int n, void *Client_data)

 {
 {

-    m_clientDataDict.Set(N, (wxClientData*)Client_data, FALSE);
+    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


@@ -415,9 +414,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);


@@ -433,52 +431,48 @@ 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::DoInsertItems(const wxArrayString& items, int pos)
+wxString wxListBox::GetString(unsigned int n) const

 {
 {

-    wxSizeKeeper sk( this );
-    Widget listBox = (Widget) m_mainWidget;
-
-    bool managed = XtIsManaged(listBox);
+    return wxDoGetStringInList( (Widget)m_mainWidget, n );
+}

 
 

-    if (managed)
-        XtUnmanageChild(listBox);
+void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
+{
+    Widget listBox = (Widget) m_mainWidget;

 
     XmString *text = new XmString[items.GetCount()];
 
     XmString *text = new XmString[items.GetCount()];

-    size_t i;
+    unsigned int i;

     // Steve Hammes: Motif 1.1 compatibility
     // #if XmVersion > 1100
     // Corrected by Sergey Krasnov from Steve Hammes' code
 #if XmVersion > 1001
     for (i = 0; i < items.GetCount(); i++)
     // Steve Hammes: Motif 1.1 compatibility
     // #if XmVersion > 1100
     // Corrected by Sergey Krasnov from Steve Hammes' code
 #if XmVersion > 1001
     for (i = 0; i < 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++)
     {
     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);
     }
         // Another Sergey correction
         XmListAddItemUnselected(listBox, text[i], pos+i+1);
     }


@@ -491,15 +485,10 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
     // selection policy!!
     SetSelectionPolicy();
 
     // selection policy!!
     SetSelectionPolicy();
 

-    if (managed)
-        XtManageChild(listBox);
-
-    sk.Restore();
-

     m_noItems += items.GetCount();
 }
 
     m_noItems += items.GetCount();
 }
 

-void wxListBox::SetString(int N, const wxString& s)
+void wxListBox::SetString(unsigned int n, const wxString& s)

 {
     wxSizeKeeper sk( this );
     Widget listBox = (Widget) m_mainWidget;
 {
     wxSizeKeeper sk( this );
     Widget listBox = (Widget) m_mainWidget;


@@ -508,19 +497,19 @@ void wxListBox::SetString(int N, const wxString& s)
 
     // delete the item and add it again.
     // FIXME isn't there a way to change it in place?
 
     // 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);
+    XmListDeletePos (listBox, n+1);
+    XmListAddItem (listBox, text(), n+1);

 
     sk.Restore();
 }
 
 void wxListBox::Command (wxCommandEvent & event)
 {
 
     sk.Restore();
 }
 
 void wxListBox::Command (wxCommandEvent & event)
 {

-    if (event.m_extraLong)
-        SetSelection (event.m_commandInt);
+    if (event.GetExtraLong())
+        SetSelection (event.GetInt());

     else
     {
     else
     {

-        Deselect (event.m_commandInt);
+        Deselect (event.GetInt());

         return;
     }
     ProcessCommand (event);
         return;
     }
     ProcessCommand (event);


@@ -547,8 +536,8 @@ void wxListBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
         event.SetClientObject( item->GetClientObject(n) );
     else if ( item->HasClientUntypedData() )
         event.SetClientData( item->GetClientData(n) );
         event.SetClientObject( item->GetClientObject(n) );
     else if ( item->HasClientUntypedData() )
         event.SetClientData( item->GetClientData(n) );

-    event.m_commandInt = n;
-    event.m_extraLong = TRUE;
+    event.SetInt(n);
+    event.SetExtraLong(true);

     event.SetEventObject(item);
     event.SetString( item->GetString( n ) );
 
     event.SetEventObject(item);
     event.SetString( item->GetString( n ) );
 


@@ -605,8 +594,8 @@ void wxListBox::ChangeBackgroundColour()
     * function to change them (by default, taken from wxSystemSettings)
     */
     wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     * 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)),
 
     XtVaSetValues (hsb,
         XmNtroughColor, backgroundColour.AllocColour(XtDisplay(hsb)),


@@ -615,7 +604,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()


@@ -633,13 +623,62 @@ 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
+unsigned int wxListBox::GetCount() const

 {
     return m_noItems;
 }
 {
     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