/////////////////////////////////////////////////////////////////////////////
-// Name: combobox.cpp
+// Name: src/motif/combobox.cpp
// Purpose: wxComboBox class
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "combobox.h"
-#endif
-
-#include "wx/setup.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/arrstr.h"
+#endif
#ifdef __VMS__
#pragma message disable nosimpint
const wxString& name)
{
if( !CreateControl( parent, id, pos, size, style, validator, name ) )
- return FALSE;
+ return false;
+ PreCreation();
m_noStrings = n;
SetValue(value);
- ChangeFont(FALSE);
-
XtAddCallback (buttonWidget, XmNselectionCallback, (XtCallbackProc) wxComboBoxCallback,
(XtPointer) this);
XtAddCallback (buttonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxComboBoxCallback,
(XtPointer) this);
+ PostCreation();
AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
- ChangeBackgroundColour();
-
- return TRUE;
+ return true;
}
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
const wxString& name)
{
wxCArrayString chs(choices);
- return Create(parent, id, value, pos, size, chs.GetCount(),
+ return Create(parent, id, value, pos, size, chs.GetCount(),
chs.GetStrings(), style, validator, name);
}
DetachWidget((Widget) m_mainWidget); // Removes event handlers
XtDestroyWidget((Widget) m_mainWidget);
m_mainWidget = (WXWidget) 0;
- if ( HasClientObjectData() )
- m_clientDataDict.DestroyData();
}
-void wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+void wxComboBox::DoSetSize(int x, int y,
+ int width, int WXUNUSED(height),
+ int sizeFlags)
{
// Necessary so it doesn't call wxChoice::SetSize
wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags);
void wxComboBox::SetValue(const wxString& value)
{
- m_inSetValue = TRUE;
if( !value.empty() )
- XmComboBoxSetString( (Widget)m_mainWidget,
- wxConstCast(value.c_str(), char) );
- m_inSetValue = FALSE;
+ {
+ m_inSetValue = true;
+ XmComboBoxSetString((Widget)m_mainWidget, value.char_str());
+ m_inSetValue = false;
+ }
}
-void wxComboBox::SetString(int n, const wxString& s)
+void wxComboBox::SetString(unsigned int WXUNUSED(n), const wxString& WXUNUSED(s))
{
wxFAIL_MSG( wxT("wxComboBox::SetString only implemented for Motif 2.0") );
}
-int wxComboBox::DoAppend(const wxString& item)
+// TODO auto-sorting is not supported by the code
+int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
+ unsigned int pos,
+ void **clientData,
+ wxClientDataType type)
{
- wxXmString str( item.c_str() );
- XmComboBoxAddItem((Widget) m_mainWidget, str(), 0);
- m_stringList.Add(item);
- m_noStrings ++;
+ const unsigned int numItems = items.GetCount();
- return GetCount() - 1;
-}
-
-int wxComboBox::DoInsert(const wxString& item, int pos)
-{
- wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
- wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
-
- if (pos == GetCount())
- return DoAppend(item);
-
- wxXmString str( item.c_str() );
- XmComboBoxAddItem((Widget) m_mainWidget, str(), pos+1);
- wxChar* copy = wxStrcpy(new wxChar[item.length() + 1], item.c_str());
- m_stringList.Insert(pos, copy);
- m_noStrings ++;
+ AllocClientData(numItems);
+ for( unsigned int i = 0; i < numItems; ++i, ++pos )
+ {
+ wxXmString str( items[i].c_str() );
+ XmComboBoxAddItem((Widget) m_mainWidget, str(), GetMotifPosition(pos));
+ wxChar* copy = wxStrcpy(new wxChar[items[i].length() + 1], items[i].c_str());
+ m_stringList.Insert(pos, copy);
+ m_noStrings ++;
+ InsertNewItemClientData(pos, clientData, i, type);
+ }
- return pos;
+ return pos - 1;
}
-void wxComboBox::Delete(int n)
+void wxComboBox::DoDeleteOneItem(unsigned int n)
{
XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
wxStringList::Node *node = m_stringList.Item(n);
delete[] node->GetData();
delete node;
}
- m_clientDataDict.Delete(n, HasClientObjectData());
+ wxControlWithItems::DoDeleteOneItem(n);
m_noStrings--;
}
-void wxComboBox::Clear()
+void wxComboBox::DoClear()
{
XmComboBoxDeleteAllItems((Widget) m_mainWidget);
m_stringList.Clear();
- if ( HasClientObjectData() )
- m_clientDataDict.DestroyData();
+ wxControlWithItems::DoClear();
m_noStrings = 0;
}
return sel - 1;
}
-wxString wxComboBox::GetString(int n) const
+wxString wxComboBox::GetString(unsigned int n) const
{
wxStringList::Node *node = m_stringList.Item(n);
if (node)
return wxEmptyString;
}
-int wxComboBox::FindString(const wxString& s) const
+int wxComboBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const
{
+ // FIXME: back to base class for not supported value of bCase
+
int *pos_list = NULL;
int count = 0;
wxXmString text( s );
return pos;
}
- return -1;
+ return wxNOT_FOUND;
}
// Clipboard operations
return (long) XmComboBoxGetInsertionPosition ((Widget) m_mainWidget);
}
-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const
{
- return (long) XmComboBoxGetLastPosition ((Widget) m_mainWidget);
+ return (wxTextPos) XmComboBoxGetLastPosition ((Widget) m_mainWidget);
}
void wxComboBox::Replace(long from, long to, const wxString& value)
{
XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from,
(XmTextPosition) to,
- wxConstCast(value.c_str(), char));
+ value.char_str());
}
void wxComboBox::Remove(long from, long to)
{
wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED,
item->GetId());
- event.m_commandInt = cbs->index - 1;
- event.m_commandString = item->GetString (event.m_commandInt);
+ event.SetInt(cbs->index - 1);
+ event.SetString( item->GetString ( event.GetInt() ) );
if ( item->HasClientObjectData() )
event.SetClientObject( item->GetClientObject(cbs->index - 1) );
else if ( item->HasClientUntypedData() )
event.SetClientData( item->GetClientData(cbs->index - 1) );
- event.m_extraLong = TRUE;
+ event.SetExtraLong(true);
event.SetEventObject(item);
item->ProcessCommand (event);
break;
case XmCR_VALUE_CHANGED:
{
wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId());
- event.m_commandInt = -1;
- event.m_commandString = item->GetValue();
- event.m_extraLong = TRUE;
+ event.SetInt(-1);
+ event.SetString( item->GetValue() );
+ event.SetExtraLong(true);
event.SetEventObject(item);
item->ProcessCommand (event);
break;
projects / wxWidgets.git / blobdiff