fix to not show ampersands in the static box title (needed after the previous change)

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

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index a31b554ed9412b4ba61b5999d250626fec933aea..3502c25afce81e698d6c76bcf4a017701ef3f98a 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -10,33 +10,45 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "listbox.h"
+    #pragma implementation "listbox.h"

 #endif
 
 #endif
 

-#include "wx/listbox.h"
+#ifdef __VMS
+#define XtParent XTPARENT
+#define XtDisplay XTDISPLAY
+#endif
+
+# include "wx/listbox.h"

 #include "wx/settings.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 #include "wx/utils.h"
 
 #include "wx/settings.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 #include "wx/utils.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)
-#endif
+    IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)

 
 

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

 
 

-void wxListBoxDefaultActionProc (Widget list_w, XtPointer client_data, XmListCallbackStruct * cbs);
+static void wxListBoxDefaultActionProc(Widget list_w,
+                                XtPointer client_data,
+                                XmListCallbackStruct * cbs);

 
 // ============================================================================
 // list box control implementation
 // ============================================================================
 
 // Listbox item
 
 // ============================================================================
 // list box control implementation
 // ============================================================================
 
 // Listbox item

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

 {
     m_noItems = 0;
     m_selected = 0;
 {
     m_noItems = 0;
     m_selected = 0;


@@ -56,16 +68,16 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     //    m_backgroundColour = parent->GetBackgroundColour();
     m_backgroundColour = * wxWHITE;
     m_foregroundColour = parent->GetForegroundColour();
     //    m_backgroundColour = parent->GetBackgroundColour();
     m_backgroundColour = * wxWHITE;
     m_foregroundColour = parent->GetForegroundColour();

-    
+

     SetName(name);
     SetValidator(validator);
     SetName(name);
     SetValidator(validator);

-    
+

     if (parent) parent->AddChild(this);
     if (parent) parent->AddChild(this);

-    
+

     m_windowId = ( id == -1 ) ? (int)NewControlId() : id;
     m_windowId = ( id == -1 ) ? (int)NewControlId() : id;

-    
+

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

-    
+

     Arg args[3];
     int count;
     XtSetArg (args[0], XmNlistSizePolicy, XmCONSTANT);
     Arg args[3];
     int count;
     XtSetArg (args[0], XmNlistSizePolicy, XmCONSTANT);


@@ -82,39 +94,40 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     }
     else
         count = 2;
     }
     else
         count = 2;

-    
+

     Widget listWidget = XmCreateScrolledList (parentWidget, (char*) (const char*) name, args, count);
     Widget listWidget = XmCreateScrolledList (parentWidget, (char*) (const char*) name, args, count);

-    
+

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

-    
+

     Set(n, choices);
     Set(n, choices);

-    
+

     XtManageChild (listWidget);
     XtManageChild (listWidget);

-    
+

     long width = size.x;
     long height = size.y;
     if (width == -1)
         width = 150;
     if (height == -1)
         height = 80;
     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, 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);
     XtAddCallback (listWidget, XmNdefaultActionCallback, (XtCallbackProc) wxListBoxDefaultActionProc,
         (XtPointer) this);

-    
-    m_windowFont = parent->GetFont();
+
+    m_font = parent->GetFont();

     ChangeFont(FALSE);
     ChangeFont(FALSE);

-    
+
+    SetCanAddEventHandler(TRUE);

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, width, height);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, width, height);

-    
+

     ChangeBackgroundColour();
     ChangeBackgroundColour();

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -125,13 +138,13 @@ wxListBox::~wxListBox()
 void wxListBox::SetFirstItem(int N)
 {
     int count, length;
 void wxListBox::SetFirstItem(int N)
 {
     int count, length;

-    
+

     if (N < 0)
         return;
     XtVaGetValues ((Widget) m_mainWidget,
     if (N < 0)
         return;
     XtVaGetValues ((Widget) m_mainWidget,

-        XmNvisibleItemCount, &count,
-        XmNitemCount, &length,
-        NULL);
+                    XmNvisibleItemCount, &count,
+                    XmNitemCount, &length,
+                    NULL);

     if ((N + count) >= length)
         N = length - count;
     XmListSetPos ((Widget) m_mainWidget, N + 1);
     if ((N + count) >= length)
         N = length - count;
     XmListSetPos ((Widget) m_mainWidget, N + 1);


@@ -140,7 +153,7 @@ void wxListBox::SetFirstItem(int N)
 void wxListBox::SetFirstItem(const wxString& s)
 {
     int N = FindString (s);
 void wxListBox::SetFirstItem(const wxString& s)
 {
     int N = FindString (s);

-    
+

     if (N >= 0)
         SetFirstItem (N);
 }
     if (N >= 0)
         SetFirstItem (N);
 }


@@ -151,32 +164,33 @@ void wxListBox::Delete(int N)
     int width2, height2;
     Widget listBox = (Widget) m_mainWidget;
     GetSize (&width1, &height1);
     int width2, height2;
     Widget listBox = (Widget) m_mainWidget;
     GetSize (&width1, &height1);

-    
+

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

-    
+

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

-    
+

     XmListDeletePos (listBox, N + 1);
     XmListDeletePos (listBox, N + 1);

-    
+

     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);
     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
     // (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();
+    {
+        if (node->GetKeyInteger() >= (long)(N+1))
+            node->SetKeyInteger(node->GetKeyInteger() - 1);
+        node = node->Next();

     }
     }

-    
+

     m_noItems --;
 }
 
     m_noItems --;
 }
 


@@ -184,12 +198,12 @@ void wxListBox::Append(const wxString& item)
 {
     int width1, height1;
     int width2, height2;
 {
     int width1, height1;
     int width2, height2;

-    
+

     Widget listBox = (Widget) m_mainWidget;
     GetSize (&width1, &height1);
     Widget listBox = (Widget) m_mainWidget;
     GetSize (&width1, &height1);

-    
+

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

-    
+

     if (managed)
         XtUnmanageChild (listBox);
     int n;
     if (managed)
         XtUnmanageChild (listBox);
     int n;


@@ -198,7 +212,7 @@ void wxListBox::Append(const wxString& item)
     //  XmListAddItem(listBox, text, n + 1);
     XmListAddItemUnselected (listBox, text, 0);
     XmStringFree (text);
     //  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];
     // It seems that if the list is cleared, we must re-ask for
     // selection policy!!
     Arg args[3];


@@ -210,10 +224,10 @@ void wxListBox::Append(const wxString& item)
     else
         XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT);
     XtSetValues (listBox, args, 2);
     else
         XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT);
     XtSetValues (listBox, args, 2);

-    
+

     if (managed)
         XtManageChild (listBox);
     if (managed)
         XtManageChild (listBox);

-    
+

     GetSize (&width2, &height2);
     // Correct for randomly resized listbox - bad boy, Motif!
     if (width1 != width2 || height1 != height2)
     GetSize (&width2, &height2);
     // Correct for randomly resized listbox - bad boy, Motif!
     if (width1 != width2 || height1 != height2)


@@ -221,26 +235,26 @@ void wxListBox::Append(const wxString& item)
     m_noItems ++;
 }
 
     m_noItems ++;
 }
 

-void wxListBox::Append(const wxString& item, char *clientData)
+void wxListBox::Append(const wxString& item, void *clientData)

 {
     int width1, height1;
     int width2, height2;
 {
     int width1, height1;
     int width2, height2;

-    
+

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

-    
+

     GetSize (&width1, &height1);
     Bool managed = XtIsManaged(listBox);
     GetSize (&width1, &height1);
     Bool managed = XtIsManaged(listBox);

-    
+

     if (managed)
         XtUnmanageChild (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);
     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];
     // It seems that if the list is cleared, we must re-ask for
     // selection policy!!
     Arg args[3];


@@ -252,32 +266,32 @@ void wxListBox::Append(const wxString& item, char *clientData)
     else
         XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT);
     XtSetValues (listBox, args, 2);
     else
         XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT);
     XtSetValues (listBox, args, 2);

-    
+

     m_clientDataList.Append ((long) n, (wxObject *) clientData);
     m_clientDataList.Append ((long) n, (wxObject *) clientData);

-    
+

     if (managed)
         XtManageChild (listBox);
     if (managed)
         XtManageChild (listBox);

-    
+

     GetSize (&width2, &height2);
     GetSize (&width2, &height2);

-    
+

     // Correct for randomly resized listbox - bad boy, Motif!
     if (width1 != width2 || height1 != height2)
         SetSize (-1, -1, width1, height1);
     // Correct for randomly resized listbox - bad boy, Motif!
     if (width1 != width2 || height1 != height2)
         SetSize (-1, -1, width1, height1);

-    
+

     m_noItems ++;
 }
 
     m_noItems ++;
 }
 

-void wxListBox::Set(int n, const wxString *choices, char** clientData)
+void wxListBox::Set(int n, const wxString *choices, void** clientData)

 {
     m_clientDataList.Clear();
     int width1, height1;
     int width2, height2;
 {
     m_clientDataList.Clear();
     int width1, height1;
     int width2, height2;

-    
+

     Widget listBox = (Widget) m_mainWidget;
     GetSize (&width1, &height1);
     Widget listBox = (Widget) m_mainWidget;
     GetSize (&width1, &height1);

-    
+

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

-    
+

     if (managed)
         XtUnmanageChild (listBox);
         /***
     if (managed)
         XtUnmanageChild (listBox);
         /***


@@ -292,16 +306,16 @@ void wxListBox::Set(int n, const wxString *choices, char** clientData)
     int i;
     for (i = 0; i < n; i++)
         text[i] = XmStringCreateSimple ((char*) (const char*) choices[i]);
     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]);
     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;
         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];
         // It seems that if the list is cleared, we must re-ask for
         // selection policy!!
         Arg args[3];


@@ -313,15 +327,15 @@ void wxListBox::Set(int n, const wxString *choices, char** clientData)
         else
             XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT);
         XtSetValues (listBox, args, 2);
         else
             XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT);
         XtSetValues (listBox, args, 2);

-        
+

         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);
         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 = n;
 }
 


@@ -347,21 +361,21 @@ void wxListBox::Clear()
 {
     if (m_noItems <= 0)
         return;
 {
     if (m_noItems <= 0)
         return;

-    
+

     int width1, height1;
     int width2, height2;
     int width1, height1;
     int width2, height2;

-    
+

     Widget listBox = (Widget) m_mainWidget;
     GetSize (&width1, &height1);
     Widget listBox = (Widget) m_mainWidget;
     GetSize (&width1, &height1);

-    
+

     XmListDeleteAllItems (listBox);
     m_clientDataList.Clear ();
     GetSize (&width2, &height2);
     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);
     // Correct for randomly resized listbox - bad boy, Motif!
     if (width1 != width2 || height1 != height2)
         SetSize (-1, -1, width1, height1);

-    
+

     m_noItems = 0;
 }
 
     m_noItems = 0;
 }
 


@@ -370,37 +384,37 @@ void wxListBox::SetSelection(int N, bool select)
     m_inSetValue = TRUE;
     if (select)
     {
     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);
-          
+#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);
             XmListSelectPos ((Widget) m_mainWidget, N + 1, FALSE);

-            
-              XtVaSetValues ((Widget) m_mainWidget, XmNselectionPolicy, XmEXTENDED_SELECT, NULL);
-              }
-              else
-        */
-        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::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,16 +436,16 @@ void wxListBox::Deselect(int N)
     XmListDeselectPos ((Widget) m_mainWidget, N + 1);
 }
 
     XmListDeselectPos ((Widget) m_mainWidget, N + 1);
 }
 

-char *wxListBox::GetClientData(int N) const
+void *wxListBox::GetClientData(int N) const

 {
     wxNode *node = m_clientDataList.Find ((long) N);
     if (node)
 {
     wxNode *node = m_clientDataList.Find ((long) N);
     if (node)

-        return (char *) node->Data ();
+        return (void *) node->Data ();

     else
         return NULL;
 }
 
     else
         return NULL;
 }
 

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

 {
     wxNode *node = m_clientDataList.Find ((long) N);
     if (node)
 {
     wxNode *node = m_clientDataList.Find ((long) N);
     if (node)


@@ -444,7 +458,7 @@ void wxListBox::SetClientData(int N, char *Client_data)
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
     aSelections.Empty();
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
     aSelections.Empty();

-    
+

     Widget listBox = (Widget) m_mainWidget;
     int *posList = NULL;
     int posCnt = 0;
     Widget listBox = (Widget) m_mainWidget;
     int *posList = NULL;
     int posCnt = 0;


@@ -454,11 +468,11 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
         if (posCnt > 0)
         {
             aSelections.Alloc(posCnt);
         if (posCnt > 0)
         {
             aSelections.Alloc(posCnt);

-            
+

             int i;
             for (i = 0; i < posCnt; i++)
                 aSelections.Add(posList[i] - 1);
             int i;
             for (i = 0; i < posCnt; i++)
                 aSelections.Add(posList[i] - 1);

-            
+

             XtFree ((char *) posList);
             return posCnt;
         }
             XtFree ((char *) posList);
             return posCnt;
         }


@@ -511,14 +525,14 @@ wxString wxListBox::GetString(int N) const
         return wxEmptyString;
 }
 
         return wxEmptyString;
 }
 

-void wxListBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxListBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
 {

-    wxWindow::SetSize(x, y, width, height, sizeFlags);
-    
+    wxWindow::DoSetSize(x, y, width, height, sizeFlags);
+

     // Check resulting size is correct
     int tempW, tempH;
     GetSize (&tempW, &tempH);
     // Check resulting size is correct
     int tempW, tempH;
     GetSize (&tempW, &tempH);

-    
+

     /*
     if (tempW != width || tempH != height)
     {
     /*
     if (tempW != width || tempH != height)
     {


@@ -531,16 +545,16 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
     int width1, height1;
     int width2, height2;
 {
     int width1, height1;
     int width2, height2;

-    
+

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

-    
+

     GetSize(&width1, &height1);
     GetSize(&width1, &height1);

-    
+

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

-    
+

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

-    
+

     XmString *text = new XmString[nItems];
     int i;
     // Steve Hammes: Motif 1.1 compatibility
     XmString *text = new XmString[nItems];
     int i;
     // Steve Hammes: Motif 1.1 compatibility


@@ -560,9 +574,9 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 #endif
     for (i = 0; i < nItems; i++)
         XmStringFree(text[i]);
 #endif
     for (i = 0; i < nItems; i++)
         XmStringFree(text[i]);

-    
+

     delete[] text;
     delete[] text;

-    
+

     // It seems that if the list is cleared, we must re-ask for
     // selection policy!!
     Arg args[3];
     // It seems that if the list is cleared, we must re-ask for
     // selection policy!!
     Arg args[3];


@@ -573,15 +587,15 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
         XtSetArg(args[1], XmNselectionPolicy, XmEXTENDED_SELECT);
     else XtSetArg(args[1], XmNselectionPolicy, XmBROWSE_SELECT);
     XtSetValues(listBox,args,2) ;
         XtSetArg(args[1], XmNselectionPolicy, XmEXTENDED_SELECT);
     else XtSetArg(args[1], XmNselectionPolicy, XmBROWSE_SELECT);
     XtSetValues(listBox,args,2) ;

-    
+

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


@@ -589,34 +603,19 @@ void wxListBox::SetString(int N, const wxString& s)
 {
     int width1, height1;
     int width2, height2;
 {
     int width1, height1;
     int width2, height2;

-    
+

     Widget listBox = (Widget) m_mainWidget;
     GetSize (&width1, &height1);
     Widget listBox = (Widget) m_mainWidget;
     GetSize (&width1, &height1);

-    
+

     XmString text = XmStringCreateSimple ((char*) (const char*) s);
     XmString text = XmStringCreateSimple ((char*) (const char*) s);

-    
-    // WHAT'S THE MOTIF CALL TO SET THE TEXT OF AN EXISTING
-    // ITEM???
-    // There isn't one, so delete the item and add it again.
+
+    // delete the item and add it again.
+    // FIXME isn't there a way to change it in place?

     XmListDeletePos (listBox, N+1);
     XmListAddItem (listBox, text, N+1);
     XmListDeletePos (listBox, N+1);
     XmListAddItem (listBox, text, N+1);

-    
+

     XmStringFree(text);
     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)
     GetSize (&width2, &height2);
     // Correct for randomly resized listbox - bad boy, Motif!
     if (width1 != width2 || height1 != height2)


@@ -631,11 +630,12 @@ int wxListBox::Number () const
 // For single selection items only
 wxString wxListBox::GetStringSelection () const
 {
 // For single selection items only
 wxString wxListBox::GetStringSelection () const
 {

-    int sel = GetSelection ();
+    wxString res;
+    int sel = GetSelection();

     if (sel > -1)
     if (sel > -1)

-        return this->GetString (sel);
-    else
-        return wxString("");
+        res = GetString(sel);
+
+    return res;

 }
 
 bool wxListBox::SetStringSelection (const wxString& s, bool flag)
 }
 
 bool wxListBox::SetStringSelection (const wxString& s, bool flag)


@@ -662,10 +662,10 @@ void wxListBox::Command (wxCommandEvent & event)
     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 

-void wxListBoxCallback (Widget w, XtPointer clientData,
+void wxListBoxCallback (Widget WXUNUSED(w), XtPointer clientData,

                         XmListCallbackStruct * cbs)
 {
                         XmListCallbackStruct * cbs)
 {

-/*
+    /*

     if (cbs->reason == XmCR_EXTENDED_SELECT)
         cout << "*** Extend select\n";
     else if (cbs->reason == XmCR_SINGLE_SELECT)
     if (cbs->reason == XmCR_EXTENDED_SELECT)
         cout << "*** Extend select\n";
     else if (cbs->reason == XmCR_SINGLE_SELECT)


@@ -682,12 +682,12 @@ void wxListBoxCallback (Widget w, XtPointer clientData,
     else if (cbs->selection_type == XmADDITION)
         cout << "*** Addition\n";
     */
     else if (cbs->selection_type == XmADDITION)
         cout << "*** Addition\n";
     */

-    
+

     wxListBox *item = (wxListBox *) clientData;
     wxListBox *item = (wxListBox *) clientData;

-    
+

     if (item->InSetValue())
         return;
     if (item->InSetValue())
         return;

-    
+

     wxCommandEvent event (wxEVT_COMMAND_LISTBOX_SELECTED, item->GetId());
     switch (cbs->reason)
     {
     wxCommandEvent event (wxEVT_COMMAND_LISTBOX_SELECTED, item->GetId());
     switch (cbs->reason)
     {


@@ -695,12 +695,10 @@ void wxListBoxCallback (Widget w, XtPointer clientData,
     case XmCR_BROWSE_SELECT:
         {
             event.m_clientData = item->GetClientData (cbs->item_position - 1);
     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);
             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;
         }
     case XmCR_EXTENDED_SELECT:
             break;
         }
     case XmCR_EXTENDED_SELECT:


@@ -728,10 +726,10 @@ void wxListBoxCallback (Widget w, XtPointer clientData,
 * designated "default button" in the action area and activate it
 * as if the user had selected it.
 */
 * 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)
+void wxListBoxDefaultActionProc (Widget WXUNUSED(list_w), XtPointer client_data, XmListCallbackStruct * WXUNUSED(cbs))

 {
     wxListBox *lbox = (wxListBox *) client_data;
 {
     wxListBox *lbox = (wxListBox *) client_data;

-    
+

     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, lbox->GetId());
     event.SetEventObject( lbox );
     lbox->GetEventHandler()->ProcessEvent(event) ;
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, lbox->GetId());
     event.SetEventObject( lbox );
     lbox->GetEventHandler()->ProcessEvent(event) ;


@@ -750,42 +748,118 @@ void wxListBox::ChangeFont(bool keepOriginalSize)
 void wxListBox::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 void wxListBox::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();

-    
+

     Widget parent = XtParent ((Widget) m_mainWidget);
     Widget hsb, vsb;
     Widget parent = XtParent ((Widget) m_mainWidget);
     Widget hsb, vsb;

-    
+

     XtVaGetValues (parent,
         XmNhorizontalScrollBar, &hsb,
         XmNverticalScrollBar, &vsb,
         NULL);
     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);
+    wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

     DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
     DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
     DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
     DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);

-    
+
+    XtVaSetValues (hsb,
+        XmNtroughColor, backgroundColour.AllocColour(XtDisplay(hsb)),
+        NULL);
+    XtVaSetValues (vsb,
+        XmNtroughColor, backgroundColour.AllocColour(XtDisplay(vsb)),
+        NULL);
+

     DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
 }
 
 void wxListBox::ChangeForegroundColour()
 {
     wxWindow::ChangeForegroundColour();
     DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
 }
 
 void wxListBox::ChangeForegroundColour()
 {
     wxWindow::ChangeForegroundColour();

-    
+

     Widget parent = XtParent ((Widget) m_mainWidget);
     Widget hsb, vsb;
     Widget parent = XtParent ((Widget) m_mainWidget);
     Widget hsb, vsb;

-    
-    XtVaGetValues (parent,
-        XmNhorizontalScrollBar, &hsb,
-        XmNverticalScrollBar, &vsb,
-        NULL);
-        /* TODO: should scrollbars be affected? Should probably have separate
-        * function to change them (by default, taken from wxSystemSettings)
+
+    XtVaGetValues(parent,
+                  XmNhorizontalScrollBar, &hsb,
+                  XmNverticalScrollBar, &vsb,
+                  NULL);
+
+    /* TODO: should scrollbars be affected? Should probably have separate
+             function to change them (by default, taken from wxSystemSettings)
+

         DoChangeForegroundColour((WXWidget) hsb, m_foregroundColour);
         DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
         DoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
     */
 }
 
         DoChangeForegroundColour((WXWidget) hsb, m_foregroundColour);
         DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
         DoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
     */
 }
 

+// These implement functions needed by wxControlWithItems.
+// Unfortunately, they're not all implemented yet.
+
+int wxListBox::GetCount() const
+{
+    return Number();
+}
+
+int wxListBox::DoAppend(const wxString& item)
+{
+    Append(item, (void*) NULL);
+    return GetCount() - 1;
+}

 
 

+// Just appends, doesn't yet insert
+void wxListBox::DoInsertItems(const wxArrayString& items, int WXUNUSED(pos))
+{
+    size_t nItems = items.GetCount();
+
+    for ( size_t n = 0; n < nItems; n++ )
+    {
+        Append( items[n], (void*) NULL);
+    }
+}
+
+void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
+{
+    size_t nItems = items.GetCount();
+    wxString* strings = new wxString[nItems];
+
+    for ( size_t n = 0; n < nItems; n++ )
+    {
+        strings[n] = items[n];
+    }
+    Set(nItems, strings, clientData);
+
+    delete[] strings;
+}
+
+void wxListBox::DoSetFirstItem(int WXUNUSED(n))
+{
+    wxFAIL_MSG( wxT("wxListBox::DoSetFirstItem not implemented") );
+}
+
+void wxListBox::DoSetItemClientData(int n, void* clientData)
+{
+    SetClientData(n, clientData);
+}
+
+void* wxListBox::DoGetItemClientData(int n) const
+{
+    return GetClientData(n);
+}
+
+void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+{
+    DoSetItemClientData(n, (void*) clientData);
+}
+
+wxClientData* wxListBox::DoGetItemClientObject(int n) const
+{
+    return (wxClientData*) DoGetItemClientData(n);
+}
+
+void wxListBox::Select(int n)
+{
+    SetSelection(n, TRUE);
+}