/////////////////////////////////////////////////////////////////////////////
-// Name: combobox.cpp
+// Name: src/motif/combobox.cpp
// Purpose: wxComboBox class
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_COMBOBOX
#include "wx/combobox.h"
-#if wxUSE_COMBOBOX
+#ifndef WX_PRECOMP
+ #include "wx/arrstr.h"
+#endif
#ifdef __VMS__
#pragma message disable nosimpint
#ifdef __VMS__
#pragma message enable nosimpint
#endif
+
+// use the old, GPL'd combobox
+#if (XmVersion < 2000)
+
#include "xmcombo/xmcombo.h"
#include "wx/motif/private.h"
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);
- SetCanAddEventHandler(TRUE);
+ 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& value,
+ const wxPoint& pos,
+ const wxSize& size,
+ const wxArrayString& choices,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
+{
+ wxCArrayString chs(choices);
+ return Create(parent, id, value, pos, size, chs.GetCount(),
+ chs.GetStrings(), style, validator, name);
}
wxComboBox::~wxComboBox()
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;
+ m_inSetValue = true;
if( !value.empty() )
- XmComboBoxSetString( (Widget)m_mainWidget, (char*)value.c_str() );
- m_inSetValue = FALSE;
+ XmComboBoxSetString( (Widget)m_mainWidget,
+ wxConstCast(value.c_str(), char) );
+ m_inSetValue = false;
+}
+
+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)
return GetCount() - 1;
}
-void wxComboBox::Delete(int n)
+int wxComboBox::DoInsert(const wxString& item, unsigned int pos)
+{
+ wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
+ wxCHECK_MSG(IsValidInsert(pos), -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 ++;
+
+ return pos;
+}
+
+void wxComboBox::Delete(unsigned int n)
{
XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
- wxNode *node = m_stringList.Nth(n);
+ wxStringList::Node *node = m_stringList.Item(n);
if (node)
{
- delete[] (char *)node->Data();
+ delete[] node->GetData();
delete node;
}
m_clientDataDict.Delete(n, HasClientObjectData());
return sel - 1;
}
-wxString wxComboBox::GetString(int n) const
+wxString wxComboBox::GetString(unsigned int n) const
{
- wxNode *node = m_stringList.Nth(n);
+ wxStringList::Node *node = m_stringList.Item(n);
if (node)
- return wxString((char *) node->Data ());
+ return wxString(node->GetData ());
else
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,
- (char*) (const char*) value);
+ XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from,
+ (XmTextPosition) to,
+ wxConstCast(value.c_str(), char));
}
void wxComboBox::Remove(long from, long to)
case XmCR_SINGLE_SELECT:
case XmCR_BROWSE_SELECT:
{
- wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED, item->GetId());
- event.m_commandInt = cbs->index - 1;
- event.m_commandString = item->GetString (event.m_commandInt);
+ wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED,
+ item->GetId());
+ 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;
return wxWindow::DoGetBestSize();
}
-#endif
+#endif // XmVersion < 2000
+#endif // wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff