///////////////////////////////////////////////////////////////////////////////
-// Name: listbox.cpp
+// Name: src/motif/listbox.cpp
// Purpose: wxListBox
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "listbox.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
+#if wxUSE_LISTBOX
-# include "wx/listbox.h"
-#include "wx/settings.h"
-#include "wx/dynarray.h"
-#include "wx/log.h"
-#include "wx/utils.h"
+#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__
#pragma message disable nosimpint
#endif
#include "wx/motif/private.h"
- IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
static void wxListBoxCallback(Widget w,
XtPointer clientData,
class wxSizeKeeper
{
int m_x, m_y;
- wxWindow* m_w;
+ int m_w, m_h;
+ wxWindow* m_wnd;
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;
- m_w->GetSize( &x, &y );
+ m_wnd->GetSize( &x, &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 );
}
};
{
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();
-
- WXFontType fontType = (WXFontType)NULL;
-
- if( m_font.Ok() )
- {
- fontType = m_font.GetFontType(XtDisplay(parentWidget));
- }
+ Display* dpy = XtDisplay(parentWidget);
Arg args[4];
int count = 0;
( m_windowStyle & wxLB_EXTENDED ) ? XmEXTENDED_SELECT :
XmBROWSE_SELECT );
++count;
- if( fontType )
+ if( m_font.Ok() )
{
- XtSetArg( args[count], (String)wxFont::GetFontTag(), fontType );
+ XtSetArg( args[count],
+ (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy) );
++count;
}
if( m_windowStyle & wxLB_ALWAYS_SB )
Widget listWidget =
XmCreateScrolledList(parentWidget,
- wxConstCast(name.c_str(), char), args, count);
+ name.char_str(), args, count);
m_mainWidget = (WXWidget) listWidget;
(XtCallbackProc) wxListBoxCallback,
(XtPointer) this);
- SetCanAddEventHandler(TRUE);
+ PostCreation();
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, best.x, best.y);
- ChangeBackgroundColour();
-
- return TRUE;
+ return true;
}
-wxListBox::~wxListBox()
+bool wxListBox::Create(wxWindow *parent, wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ const wxArrayString& choices,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
{
- if( HasClientObjectData() )
- m_clientDataDict.DestroyData();
+ wxCArrayString chs(choices);
+ return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name);
}
void wxListBox::SetSelectionPolicy()
{
int count, length;
- if (N < 0)
+ if (!IsValid(N))
return;
+
XtVaGetValues ((Widget) m_mainWidget,
XmNvisibleItemCount, &count,
XmNitemCount, &length,
XmListSetPos ((Widget) m_mainWidget, N + 1);
}
-void wxListBox::Delete(int N)
+void wxListBox::DoDeleteOneItem(unsigned int n)
{
- wxSizeKeeper sk( this );
Widget listBox = (Widget) m_mainWidget;
- bool managed = XtIsManaged(listBox);
+ XmListDeletePos (listBox, n + 1);
- if (managed)
- XtUnmanageChild (listBox);
-
- XmListDeletePos (listBox, N + 1);
-
- if (managed)
- XtManageChild (listBox);
-
- sk.Restore();
- m_clientDataDict.Delete(N, HasClientObjectData());
+ wxListBoxBase::DoDeleteOneItem(n);
m_noItems --;
}
-int wxListBox::DoAppend(const wxString& item)
-{
- wxSizeKeeper sk( this );
- Widget listBox = (Widget) m_mainWidget;
-
- bool managed = XtIsManaged(listBox);
-
- if (managed)
- XtUnmanageChild (listBox);
- int n;
- XtVaGetValues (listBox, XmNitemCount, &n, NULL);
- wxXmString text( item );
- // XmListAddItem(listBox, text, n + 1);
- XmListAddItemUnselected (listBox, text(), 0);
-
- // It seems that if the list is cleared, we must re-ask for
- // selection policy!!
- SetSelectionPolicy();
-
- if (managed)
- XtManageChild (listBox);
-
- sk.Restore();
- m_noItems ++;
-
- return GetCount() - 1;
-}
-
-void wxListBox::DoSetItems(const wxArrayString& items, void** clientData)
-{
- wxSizeKeeper sk( this );
- Widget listBox = (Widget) m_mainWidget;
-
- if( HasClientObjectData() )
- m_clientDataDict.DestroyData();
-
- bool managed = XtIsManaged(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]);
-
- 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!!
- SetSelectionPolicy();
-
- if (managed)
- XtManageChild (listBox);
-
- sk.Restore();
-
- m_noItems = items.GetCount();
-}
-
int wxDoFindStringInList(Widget w, const wxString& s)
{
wxXmString str( s );
bool success = XmListGetMatchPos (w, str(),
&positions, &no_positions);
- if (success)
+ if (success && positions)
{
int pos = positions[0];
- if (positions)
- XtFree ((char *) positions);
+ XtFree ((char *) positions);
return pos - 1;
}
else
return -1;
}
-int wxListBox::FindString(const wxString& s) const
+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()
+void wxListBox::DoClear()
{
- if (m_noItems <= 0)
+ if (!m_noItems)
return;
wxSizeKeeper sk( this );
Widget listBox = (Widget) m_mainWidget;
XmListDeleteAllItems (listBox);
- if( HasClientObjectData() )
- m_clientDataDict.DestroyData();
sk.Restore();
+ wxListBoxBase::DoClear();
m_noItems = 0;
}
-void wxListBox::SetSelection(int N, bool select)
+void wxListBox::DoSetSelection(int N, bool select)
{
- m_inSetValue = TRUE;
+ m_inSetValue = true;
if (select)
{
#if 0
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,
}
else
#endif // 0
- XmListSelectPos ((Widget) m_mainWidget, N + 1, FALSE);
+ XmListSelectPos ((Widget) m_mainWidget, N + 1, False);
}
else
XmListDeselectPos ((Widget) m_mainWidget, N + 1);
- m_inSetValue = FALSE;
+ m_inSetValue = false;
}
bool wxListBox::IsSelected(int N) const
wxArrayInt theSelections;
int count = GetSelections (theSelections);
if (count == 0)
- return FALSE;
+ return false;
else
{
int j;
for (j = 0; j < count; j++)
if (theSelections[j] == N)
- return TRUE;
+ return true;
}
- return FALSE;
-}
-
-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
-{
- m_clientDataDict.Set(n, clientData, FALSE);
-}
-
-wxClientData* wxListBox::DoGetItemClientObject(int n) const
-{
- return m_clientDataDict.Get(n);
-}
-
-void *wxListBox::DoGetItemClientData(int N) const
-{
- return (void*)m_clientDataDict.Get(N);
-}
-
-void wxListBox::DoSetItemClientData(int N, void *Client_data)
-{
- m_clientDataDict.Set(N, (wxClientData*)Client_data, FALSE);
+ return false;
}
// Return number of selections and an array of selected integers
return wxEmptyString;
}
-wxString wxListBox::GetString( int n ) const
+wxString wxListBox::GetString(unsigned int n) const
{
return wxDoGetStringInList( (Widget)m_mainWidget, n );
}
-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
+ unsigned int pos,
+ void **clientData, wxClientDataType type)
{
- wxSizeKeeper sk( this );
Widget listBox = (Widget) m_mainWidget;
- bool managed = XtIsManaged(listBox);
-
- if (managed)
- XtUnmanageChild(listBox);
+ const unsigned int numItems = items.GetCount();
- 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
+ XmString *text = new XmString[numItems];
+ unsigned int i;
#if XmVersion > 1001
- for (i = 0; i < items.GetCount(); i++)
+ for (i = 0; i < numItems; i++)
+ {
text[i] = wxStringToXmString(items[i]);
- XmListAddItemsUnselected(listBox, text, items.GetCount(), pos+1);
+ }
+ XmListAddItemsUnselected(listBox, text, numItems, GetMotifPosition(pos));
+ InsertNewItemsClientData(pos, numItems, clientData, type);
#else
- for (i = 0; i < items.GetCount(); i++)
+ AllocClientData(numItems);
+
+ unsigned int idx = pos;
+ for ( i = 0; i < numItems; i++, idx++ )
{
text[i] = wxStringToXmString(items[i]);
- // Another Sergey correction
- XmListAddItemUnselected(listBox, text[i], pos+i+1);
+ XmListAddItemUnselected(listBox, text[i], GetMotifPosition(idx));
+ InsertNewItemClientData(idx, clientData, i, type);
}
#endif
- for (i = 0; i < items.GetCount(); i++)
+ for (i = 0; i < numItems; i++)
XmStringFree(text[i]);
delete[] text;
- // It seems that if the list is cleared, we must re-ask for
- // selection policy!!
- SetSelectionPolicy();
-
- if (managed)
- XtManageChild(listBox);
+ m_noItems += numItems;
- sk.Restore();
+ SetSelectionPolicy();
- m_noItems += items.GetCount();
+ return pos + numItems - 1;
}
-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;
// 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)
{
- if (event.m_extraLong)
- SetSelection (event.m_commandInt);
+ if (event.GetExtraLong())
+ SetSelection (event.GetInt());
else
{
- Deselect (event.m_commandInt);
+ Deselect (event.GetInt());
return;
}
ProcessCommand (event);
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 ) );
item->DoToggleItem( n, x );
#endif
case XmCR_DEFAULT_ACTION:
- item->GetEventHandler()->ProcessEvent(event);
+ item->HandleWindowEvent(event);
break;
case XmCR_EXTENDED_SELECT:
switch (cbs->selection_type)
case XmADDITION:
case XmMODIFICATION:
item->DoToggleItem( n, x );
- item->GetEventHandler()->ProcessEvent(event);
+ item->HandleWindowEvent(event);
break;
}
break;
* 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)),
NULL);
// MBN: why change parent's background? It looks really ugly.
- // DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
+ // wxDoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, true);
}
void wxListBox::ChangeForegroundColour()
/* 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 wxDoGetListBoxBestSize( (Widget)m_mainWidget, this );
}
+#endif // wxUSE_LISTBOX
projects / wxWidgets.git / blobdiff