///////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "listbox.h"
+ #pragma implementation "listbox.h"
#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"
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/List.h>
-#include "wx/motif/private.h"
-
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+#ifdef __VMS__
+#pragma message enable nosimpint
#endif
+#include "wx/motif/private.h"
-void wxListBoxCallback (Widget w, XtPointer clientData,
- XmListCallbackStruct * cbs);
+ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
-void wxListBoxDefaultActionProc (Widget list_w, XtPointer client_data, XmListCallbackStruct * cbs);
+static void wxListBoxCallback(Widget w,
+ XtPointer clientData,
+ XmListCallbackStruct * cbs);
// ============================================================================
// list box control implementation
// ============================================================================
// Listbox item
-wxListBox::wxListBox(): m_clientDataList(wxKEY_INTEGER)
+wxListBox::wxListBox() : m_clientDataList(wxKEY_INTEGER)
{
m_noItems = 0;
- m_selected = 0;
}
bool wxListBox::Create(wxWindow *parent, wxWindowID id,
{
m_windowStyle = style;
m_noItems = n;
- m_selected = 0;
- m_backgroundColour = parent->GetBackgroundColour();
+ // m_backgroundColour = parent->GetBackgroundColour();
+ m_backgroundColour = * wxWHITE;
m_foregroundColour = parent->GetForegroundColour();
SetName(name);
else
count = 2;
- Widget listWidget = XmCreateScrolledList (parentWidget, (char*) (const char*) name, args, count);
+ Widget listWidget = XmCreateScrolledList(parentWidget,
+ (char*)name.c_str(), args, count);
m_mainWidget = (WXWidget) listWidget;
if (height == -1)
height = 80;
- XtAddCallback (listWidget, XmNbrowseSelectionCallback, (XtCallbackProc) wxListBoxCallback,
- (XtPointer) this);
- XtAddCallback (listWidget, XmNextendedSelectionCallback, (XtCallbackProc) wxListBoxCallback,
- (XtPointer) this);
- XtAddCallback (listWidget, XmNmultipleSelectionCallback, (XtCallbackProc) wxListBoxCallback,
- (XtPointer) this);
-
- XtAddCallback (listWidget, XmNdefaultActionCallback, (XtCallbackProc) wxListBoxDefaultActionProc,
- (XtPointer) this);
-
- m_windowFont = parent->GetFont();
+ 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);
+
+ m_font = parent->GetFont();
ChangeFont(FALSE);
- AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, width, height);
+ SetCanAddEventHandler(TRUE);
+ AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+ pos.x, pos.y, width, height);
ChangeBackgroundColour();
{
}
-void wxListBox::SetFirstItem(int N)
-{
- int count, length;
-
- if (N < 0)
- return;
- XtVaGetValues ((Widget) m_mainWidget,
- XmNvisibleItemCount, &count,
- XmNitemCount, &length,
- NULL);
- if ((N + count) >= length)
- N = length - count;
- XmListSetPos ((Widget) m_mainWidget, N + 1);
-}
-
-void wxListBox::SetFirstItem(const wxString& s)
+void wxListBox::DoSetFirstItem( int N )
{
- int N = FindString (s);
+ int count, length;
- if (N >= 0)
- SetFirstItem (N);
+ if (N < 0)
+ return;
+ XtVaGetValues ((Widget) m_mainWidget,
+ XmNvisibleItemCount, &count,
+ XmNitemCount, &length,
+ NULL);
+ if ((N + count) >= length)
+ N = length - count;
+ XmListSetPos ((Widget) m_mainWidget, N + 1);
}
void wxListBox::Delete(int N)
{
- int width1, height1;
- int width2, height2;
- Widget listBox = (Widget) m_mainWidget;
- GetSize (&width1, &height1);
+ int 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
- { if (node->key.integer >= (long)(N+1)) // very ugly C++ wise but no other way
- node->key.integer--; // to look at or change key value
- node = node->Next();
- }
+ // (JDH) need to add code here to take care of clientDataList
+ // get item from list
+ wxNode *node = m_clientDataList.Find((long)N);
+ // if existed then delete from list
+ if (node) m_clientDataList.DeleteNode(node);
+ // we now have to adjust all keys that are >=N+1
+ node = m_clientDataList.First();
+ while (node)
+ {
+ if (node->GetKeyInteger() >= (long)(N+1))
+ node->SetKeyInteger(node->GetKeyInteger() - 1);
+ node = node->Next();
+ }
- m_noItems --;
+ m_noItems --;
}
-void wxListBox::Append(const wxString& item)
+int wxListBox::DoAppend(const wxString& item)
{
- int width1, height1;
- int width2, height2;
-
- Widget listBox = (Widget) m_mainWidget;
- GetSize (&width1, &height1);
-
- bool managed = XtIsManaged(listBox);
-
- if (managed)
- XtUnmanageChild (listBox);
- int n;
- XtVaGetValues (listBox, XmNitemCount, &n, NULL);
- XmString text = XmStringCreateSimple ((char*) (const char*) item);
-// XmListAddItem(listBox, text, n + 1);
- XmListAddItemUnselected (listBox, text, 0);
- XmStringFree (text);
-
- // It seems that if the list is cleared, we must re-ask for
- // selection policy!!
- Arg args[3];
- XtSetArg (args[0], XmNlistSizePolicy, XmCONSTANT);
- if (m_windowStyle & wxLB_MULTIPLE)
- XtSetArg (args[1], XmNselectionPolicy, XmMULTIPLE_SELECT);
- else if (m_windowStyle & wxLB_EXTENDED)
- XtSetArg (args[1], XmNselectionPolicy, XmEXTENDED_SELECT);
- else
- XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT);
- XtSetValues (listBox, args, 2);
-
- if (managed)
- XtManageChild (listBox);
-
- GetSize (&width2, &height2);
- // Correct for randomly resized listbox - bad boy, Motif!
- if (width1 != width2 || height1 != height2)
- SetSize (-1, -1, width1, height1);
- m_noItems ++;
-}
+ int width1, height1;
+ int width2, height2;
-void wxListBox::Append(const wxString& item, char *clientData)
-{
- int width1, height1;
- int width2, height2;
+ Widget listBox = (Widget) m_mainWidget;
+ GetSize (&width1, &height1);
- Widget listBox = (Widget) m_mainWidget;
+ bool managed = XtIsManaged(listBox);
- GetSize (&width1, &height1);
- Bool managed = XtIsManaged(listBox);
+ if (managed)
+ XtUnmanageChild (listBox);
+ int n;
+ XtVaGetValues (listBox, XmNitemCount, &n, NULL);
+ XmString text = XmStringCreateSimple ((char*) (const char*) item);
+ // XmListAddItem(listBox, text, n + 1);
+ XmListAddItemUnselected (listBox, text, 0);
+ XmStringFree (text);
- if (managed)
- XtUnmanageChild (listBox);
+ // 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);
- 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 (managed)
+ XtManageChild (listBox);
- // It seems that if the list is cleared, we must re-ask for
- // selection policy!!
- Arg args[3];
- XtSetArg (args[0], XmNlistSizePolicy, XmCONSTANT);
- if (m_windowStyle & wxLB_MULTIPLE)
- XtSetArg (args[1], XmNselectionPolicy, XmMULTIPLE_SELECT);
- else if (m_windowStyle & wxLB_EXTENDED)
- XtSetArg (args[1], XmNselectionPolicy, XmEXTENDED_SELECT);
- else
- XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT);
- XtSetValues (listBox, args, 2);
+ GetSize (&width2, &height2);
+ // Correct for randomly resized listbox - bad boy, Motif!
+ if (width1 != width2 || height1 != height2)
+ SetSize (-1, -1, width1, height1);
+ m_noItems ++;
- m_clientDataList.Append ((long) n, (wxObject *) clientData);
+ return GetCount() - 1;
+}
- if (managed)
- XtManageChild (listBox);
+void wxListBox::DoSetItems(const wxArrayString& items, void** clientData)
+{
+ m_clientDataList.Clear();
+ int width1, height1;
+ int width2, height2;
- GetSize (&width2, &height2);
+ Widget listBox = (Widget) m_mainWidget;
+ GetSize (&width1, &height1);
- // Correct for randomly resized listbox - bad boy, Motif!
- if (width1 != width2 || height1 != height2)
- SetSize (-1, -1, width1, height1);
+ bool managed = XtIsManaged(listBox);
- m_noItems ++;
-}
+ if (managed)
+ XtUnmanageChild (listBox);
+ XmString *text = new XmString[items.GetCount()];
+ size_t i;
+ for (i = 0; i < items.GetCount(); ++i)
+ text[i] = XmStringCreateSimple ((char*)items[i].c_str());
+
+ if ( clientData )
+ for (i = 0; i < items.GetCount(); ++i)
+ m_clientDataList.Append ((long) i, (wxObject *) clientData[i]);
+
+ XmListAddItems (listBox, text, items.GetCount(), 0);
+ for (i = 0; i < items.GetCount(); i++)
+ XmStringFree (text[i]);
+ delete[] text;
-void wxListBox::Set(int n, const wxString *choices, char** clientData)
-{
- m_clientDataList.Clear();
- int width1, height1;
- int width2, height2;
-
- Widget listBox = (Widget) m_mainWidget;
- GetSize (&width1, &height1);
-
- bool managed = XtIsManaged(listBox);
-
- if (managed)
- XtUnmanageChild (listBox);
-/***
- for (int i=0; i<n; i++)
- {
- XmString text = XmStringCreateSimple(choices[i]);
- XmListAddItemUnselected(listBox, text, 0);
- XmStringFree(text);
- }
-***/
- XmString *text = new XmString[n];
- int i;
- for (i = 0; i < n; i++)
- text[i] = XmStringCreateSimple ((char*) (const char*) choices[i]);
-
- if ( clientData )
- for (i = 0; i < n; i++)
- m_clientDataList.Append ((long) i, (wxObject *) clientData[i]);
-
- XmListAddItems (listBox, text, n, 0);
- for (i = 0; i < n; i++)
- XmStringFree (text[i]);
- delete[]text;
-
- // It seems that if the list is cleared, we must re-ask for
- // selection policy!!
- Arg args[3];
- XtSetArg (args[0], XmNlistSizePolicy, XmCONSTANT);
- if (m_windowStyle & wxLB_MULTIPLE)
- XtSetArg (args[1], XmNselectionPolicy, XmMULTIPLE_SELECT);
- else if (m_windowStyle & wxLB_EXTENDED)
- XtSetArg (args[1], XmNselectionPolicy, XmEXTENDED_SELECT);
- else
- XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT);
- XtSetValues (listBox, args, 2);
-
- if (managed)
- XtManageChild (listBox);
-
- GetSize (&width2, &height2);
- // Correct for randomly resized listbox - bad boy, Motif!
- if (width1 != width2 || height1 != height2)
- SetSize (-1, -1, width1, height1);
-
- m_noItems = n;
+ // It seems that if the list is cleared, we must re-ask for
+ // selection policy!!
+ Arg args[3];
+ XtSetArg (args[0], XmNlistSizePolicy, XmCONSTANT);
+ if (m_windowStyle & wxLB_MULTIPLE)
+ XtSetArg (args[1], XmNselectionPolicy, XmMULTIPLE_SELECT);
+ else if (m_windowStyle & wxLB_EXTENDED)
+ XtSetArg (args[1], XmNselectionPolicy, XmEXTENDED_SELECT);
+ else
+ XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT);
+ XtSetValues (listBox, args, 2);
+
+ if (managed)
+ XtManageChild (listBox);
+
+ GetSize (&width2, &height2);
+ // Correct for randomly resized listbox - bad boy, Motif!
+ if (width1 != width2 || height1 != height2)
+ SetSize (-1, -1, width1, height1);
+
+ m_noItems = items.GetCount();
}
int wxListBox::FindString(const wxString& s) const
{
- XmString str = XmStringCreateSimple ((char*) (const char*) s);
- int *positions = NULL;
- int no_positions = 0;
- bool success = XmListGetMatchPos ((Widget) m_mainWidget, str, &positions, &no_positions);
- XmStringFree (str);
- if (success)
+ XmString str = XmStringCreateSimple ((char*) (const char*) s);
+ int *positions = NULL;
+ int no_positions = 0;
+ bool success = XmListGetMatchPos ((Widget) m_mainWidget, str,
+ &positions, &no_positions);
+ XmStringFree (str);
+ if (success)
{
- int pos = positions[0];
- if (positions)
- XtFree ((char *) positions);
- return pos - 1;
+ int pos = positions[0];
+ if (positions)
+ XtFree ((char *) positions);
+ return pos - 1;
}
- else
- return -1;
+ else
+ return -1;
}
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;
}
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);
+#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.
+ // 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++)
- XmListSelectPos ((Widget) m_mainWidget, selections[i] + 1, FALSE);
+ int i;
+ for (i = 0; i < n; i++)
+ 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);
- }
- else
-*/
- XmListSelectPos ((Widget) m_mainWidget, N + 1, FALSE);
+ XtVaSetValues ((Widget) m_mainWidget,
+ XmNselectionPolicy, XmEXTENDED_SELECT,
+ NULL);
+ }
+ else
+#endif // 0
+ XmListSelectPos ((Widget) m_mainWidget, N + 1, FALSE);
}
- else
- XmListDeselectPos ((Widget) m_mainWidget, N + 1);
+ else
+ XmListDeselectPos ((Widget) m_mainWidget, N + 1);
- m_inSetValue = FALSE;
+ m_inSetValue = FALSE;
}
-bool wxListBox::Selected(int N) const
+bool wxListBox::IsSelected(int N) const
{
- // In Motif, no simple way to determine if the item is selected.
- wxArrayInt theSelections;
- int count = GetSelections (theSelections);
- if (count == 0)
+ // In Motif, no simple way to determine if the item is selected.
+ wxArrayInt theSelections;
+ int count = GetSelections (theSelections);
+ if (count == 0)
+ return FALSE;
+ else
+ {
+ int j;
+ for (j = 0; j < count; j++)
+ if (theSelections[j] == N)
+ return TRUE;
+ }
return FALSE;
- else
- {
- int j;
- for (j = 0; j < count; j++)
- if (theSelections[j] == N)
- return TRUE;
- }
- return FALSE;
}
-void wxListBox::Deselect(int N)
+void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
{
- XmListDeselectPos ((Widget) m_mainWidget, N + 1);
+ DoSetItemClientData(n, (void*) clientData);
}
-char *wxListBox::GetClientData(int N) const
+wxClientData* wxListBox::DoGetItemClientObject(int n) const
+{
+ return (wxClientData*) DoGetItemClientData(n);
+}
+
+void *wxListBox::DoGetItemClientData(int N) const
{
wxNode *node = m_clientDataList.Find ((long) N);
if (node)
- return (char *) node->Data ();
+ return (void *) node->Data ();
else
return NULL;
}
-void wxListBox::SetClientData(int N, char *Client_data)
+void wxListBox::DoSetItemClientData(int N, void *Client_data)
{
wxNode *node = m_clientDataList.Find ((long) N);
if (node)
// Return number of selections and an array of selected integers
int wxListBox::GetSelections(wxArrayInt& aSelections) const
{
- aSelections.Empty();
-
- Widget listBox = (Widget) m_mainWidget;
- int *posList = NULL;
- int posCnt = 0;
- bool flag = XmListGetSelectedPos (listBox, &posList, &posCnt);
- if (flag)
- {
- if (posCnt > 0)
- {
- aSelections.Alloc(posCnt);
-
- int i;
- for (i = 0; i < posCnt; i++)
- aSelections.Add(posList[i] - 1);
+ aSelections.Empty();
- XtFree ((char *) posList);
- return posCnt;
- }
- else
- return 0;
+ Widget listBox = (Widget) m_mainWidget;
+ int *posList = NULL;
+ int posCnt = 0;
+ bool flag = XmListGetSelectedPos (listBox, &posList, &posCnt);
+ if (flag)
+ {
+ if (posCnt > 0)
+ {
+ aSelections.Alloc(posCnt);
+
+ int i;
+ for (i = 0; i < posCnt; i++)
+ aSelections.Add(posList[i] - 1);
+
+ XtFree ((char *) posList);
+ return posCnt;
+ }
+ else
+ return 0;
}
- else
- return 0;
+ else
+ return 0;
}
// Get single selection, for single choice list items
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;
/*
if (tempW != width || tempH != height)
{
- cout << "wxListBox::SetSize sizes not set correctly.");
+ cout << "wxListBox::SetSize sizes not set correctly.");
}
*/
}
-void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
{
int width1, height1;
int width2, height2;
if (managed)
XtUnmanageChild(listBox);
-
- XmString *text = new XmString[nItems];
- int i;
- // Steve Hammes: Motif 1.1 compatibility
-// #if XmVersion > 1100
-// Corrected by Sergey Krasnov from Steve Hammes' code
+
+ 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
- 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] = XmStringCreateSimple((char*)items[i].c_str());
+ XmListAddItemsUnselected(listBox, text, items.GetCount(), pos+1);
#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] = XmStringCreateSimple((char*)items[i].c_str());
+ // Another Sergey correction
+ XmListAddItemUnselected(listBox, text[i], pos+i+1);
}
#endif
- for (i = 0; i < nItems; i++)
+ 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
if (width1 != width2 /*|| height1 != height2*/)
SetSize(-1, -1, width1, height1);
- m_noItems += nItems;
+ m_noItems += items.GetCount();
}
void wxListBox::SetString(int N, const wxString& 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);
XmStringFree(text);
-/*
- // It seems that if the list is cleared, we must re-ask for
- // selection policy!!
- Arg args[3];
- XtSetArg (args[0], XmNlistSizePolicy, XmCONSTANT);
- if (m_windowStyle & wxLB_MULTIPLE)
- XtSetArg (args[1], XmNselectionPolicy, XmMULTIPLE_SELECT);
- else if (m_windowStyle & wxLB_EXTENDED)
- XtSetArg (args[1], XmNselectionPolicy, XmEXTENDED_SELECT);
- else
- XtSetArg (args[1], XmNselectionPolicy, XmBROWSE_SELECT);
- XtSetValues (listBox, args, 2);
-*/
-
GetSize (&width2, &height2);
// Correct for randomly resized listbox - bad boy, Motif!
if (width1 != width2 || height1 != height2)
SetSize (-1, -1, width1, height1);
}
-int wxListBox::Number () const
-{
- return m_noItems;
-}
-
-// For single selection items only
-wxString wxListBox::GetStringSelection () const
-{
- int sel = GetSelection ();
- if (sel > -1)
- return this->GetString (sel);
- else
- return wxString("");
-}
-
-bool wxListBox::SetStringSelection (const wxString& s, bool flag)
-{
- int sel = FindString (s);
- if (sel > -1)
- {
- SetSelection (sel, flag);
- return TRUE;
- }
- else
- return FALSE;
-}
-
void wxListBox::Command (wxCommandEvent & event)
{
if (event.m_extraLong)
ProcessCommand (event);
}
-void wxListBoxCallback (Widget 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;
- wxCommandEvent event (wxEVT_COMMAND_LISTBOX_SELECTED);
+ 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:
- {
- event.m_clientData = item->GetClientData (cbs->item_position - 1);
- //event.commandString = item->GetStringSelection();
- event.m_commandInt = cbs->item_position - 1;
- event.m_extraLong = TRUE;
- event.SetEventObject(item);
- item->ProcessCommand (event);
- //delete[] event.commandString; // Let's not store the command string any more
- break;
- }
- case XmCR_EXTENDED_SELECT:
+ case XmCR_MULTIPLE_SELECT:
+ case XmCR_BROWSE_SELECT:
+#if wxUSE_CHECKLISTBOX
+ item->DoToggleItem( n, x );
+#endif
+ case XmCR_DEFAULT_ACTION:
+ item->GetEventHandler()->ProcessEvent(event);
+ break;
+ case XmCR_EXTENDED_SELECT:
+ switch (cbs->selection_type)
{
- switch (cbs->selection_type)
- {
- case XmINITIAL:
- case XmADDITION:
- case XmMODIFICATION:
- {
- event.m_clientData = item->GetClientData (cbs->item_position - 1);
- event.m_commandInt = cbs->item_position - 1;
- event.m_extraLong = TRUE;
- event.SetEventObject(item);
- item->ProcessCommand (event);
- break;
- }
- }
+ case XmINITIAL:
+ case XmADDITION:
+ case XmMODIFICATION:
+ item->DoToggleItem( n, x );
+ item->GetEventHandler()->ProcessEvent(event);
break;
}
+ break;
}
}
-/* Respond by getting the
- * designated "default button" in the action area and activate it
- * as if the user had selected it.
- */
-void wxListBoxDefaultActionProc (Widget list_w, XtPointer client_data, XmListCallbackStruct * cbs)
-{
- wxListBox *lbox = (wxListBox *) client_data;
-
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, lbox->GetId());
- event.SetEventObject( lbox );
- lbox->GetEventHandler()->ProcessEvent(event) ;
-}
-
WXWidget wxListBox::GetTopWidget() const
{
- return (WXWidget) XtParent( (Widget) m_mainWidget );
+ return (WXWidget) XtParent( (Widget) m_mainWidget );
}
void wxListBox::ChangeFont(bool keepOriginalSize)
Widget hsb, vsb;
XtVaGetValues (parent,
- XmNhorizontalScrollBar, &hsb,
- XmNverticalScrollBar, &vsb,
- NULL);
+ XmNhorizontalScrollBar, &hsb,
+ XmNverticalScrollBar, &vsb,
+ NULL);
- /* TODO: should scrollbars be affected? Should probably have separate
- * function to change them (by default, taken from wxSystemSettings)
- DoChangeBackgroundColour((WXWidget) hsb, m_backgroundColour, TRUE);
- DoChangeBackgroundColour((WXWidget) vsb, m_backgroundColour, TRUE);
+ /* TODO: should scrollbars be affected? Should probably have separate
+ * 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);
+
+ XtVaSetValues (hsb,
+ XmNtroughColor, backgroundColour.AllocColour(XtDisplay(hsb)),
+ NULL);
+ XtVaSetValues (vsb,
+ XmNtroughColor, backgroundColour.AllocColour(XtDisplay(vsb)),
+ NULL);
DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
}
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)
- DoChangeForegroundColour((WXWidget) hsb, m_foregroundColour);
- DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
- DoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
+ function to change them (by default, taken from wxSystemSettings)
+
+ DoChangeForegroundColour((WXWidget) hsb, m_foregroundColour);
+ DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
+ DoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
*/
}
-
+int wxListBox::GetCount() const
+{
+ return m_noItems;
+}
projects / wxWidgets.git / blobdiff