/////////////////////////////////////////////////////////////////////////////
-// Name: combobox_native.cpp
+// Name: src/motif/combobox_native.cpp
// Purpose: wxComboBox class
// Author: Julian Smart, Ian Brown
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#include "wx/setup.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
+#ifndef WX_PRECOMP
+ #include "wx/arrstr.h"
+#endif
+
#ifdef __VMS__
#pragma message disable nosimpint
#endif
{
if( !CreateControl( parent, id, pos, size, style, validator, name ) )
return false;
+ PreCreation();
Widget parentWidget = (Widget) parent->GetClientWidget();
Widget buttonWidget= XtVaCreateManagedWidget(name.c_str(),
xmComboBoxWidgetClass, parentWidget,
- XmNcomboBoxType, cb_type,
+ XmNcomboBoxType, cb_type,
NULL);
m_mainWidget = (Widget) buttonWidget;
SetValue(value);
- ChangeFont(false);
-
XtAddCallback (buttonWidget, XmNselectionCallback,
(XtCallbackProc) wxComboBoxCallback,
(XtPointer) this);
(XtPointer) this);
wxSize best = GetBestSize();
- if( size.x != -1 ) best.x = size.x;
- if( size.y != -1 ) best.y = size.y;
+ if( size.x != wxDefaultCoord ) best.x = size.x;
+ if( size.y != wxDefaultCoord ) best.y = size.y;
- SetCanAddEventHandler(true);
+ PostCreation();
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, best.x, best.y);
- ChangeBackgroundColour();
-
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);
+}
+
void wxComboBox::AdjustDropDownListSize()
{
int newListCount = -1, itemCount = GetCount();
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);
return str;
}
-void wxComboBox::SetString(int n, const wxString& s)
+void wxComboBox::SetString(unsigned int n, const wxString& s)
{
wxXmString text(s);
Widget listBox = GetXmList(this);
m_inSetValue = true;
XtVaSetValues( GetXmText(this),
- XmNvalue, (char *)value.c_str(),
+ XmNvalue, (const char*)value.mb_str(),
NULL);
m_inSetValue = false;
}
-int wxComboBox::DoAppend(const wxString& item)
+int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items,
+ unsigned int pos,
+ void **clientData, wxClientDataType type)
{
- wxXmString str( item.c_str() );
- XmComboBoxAddItem((Widget) m_mainWidget, str(), 0, False);
- m_noStrings ++;
+ const unsigned int numItems = items.GetCount();
+
+ AllocClientData(numItems);
+ for ( unsigned int i = 0; i < numItems; ++i, ++pos )
+ {
+ wxXmString str( items[i].c_str() );
+ XmComboBoxAddItem((Widget) m_mainWidget, str(),
+ GetMotifPosition(pos), False);
+ m_noStrings ++;
+ InsertNewItemClientData(pos, clientData, i, type);
+ }
+
AdjustDropDownListSize();
- return GetCount() - 1;
+ return pos - 1;
}
-void wxComboBox::Delete(int n)
+void wxComboBox::DoDeleteOneItem(unsigned int n)
{
#ifdef LESSTIF_VERSION
XmListDeletePos (GetXmList(this), n + 1);
XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
#endif
- m_clientDataDict.Delete(n, HasClientObjectData());
+ wxControlWithItems::DoDeleteOneItem(n);
m_noStrings--;
AdjustDropDownListSize();
}
-void wxComboBox::Clear()
+void wxComboBox::DoClear()
{
#ifdef LESSTIF_VERSION
XmListDeleteAllItems (GetXmList(this));
#else
while(m_noStrings > 0)
{
- XmComboBoxDeletePos((Widget) m_mainWidget, m_noStrings--);
+ XmComboBoxDeletePos((Widget) m_mainWidget, m_noStrings--);
}
#endif
- if ( HasClientObjectData() )
- m_clientDataDict.DestroyData();
+ wxControlWithItems::DoClear();
m_noStrings = 0;
AdjustDropDownListSize();
}
void wxComboBox::SetSelection (int n)
{
-#ifdef LESSTIF_VERSION
+ m_inSetSelection = true;
+
+#if wxCHECK_LESSTIF()
XmListSelectPos (GetXmList(this), n + 1, false);
SetValue(GetString(n));
#else
- wxXmString str( GetString(n).c_str() );
- XmComboBoxSelectItem((Widget) m_mainWidget, str());
#if 0
- // does it work for Motif
+ wxXmString str(GetString(n).c_str());
+ XmComboBoxSelectItem((Widget) m_mainWidget, str());
+#endif
XtVaSetValues( (Widget)m_mainWidget,
- XmNselectedPosition, n + 1,
+ XmNselectedPosition, n,
NULL );
#endif
-#endif
+
+ m_inSetSelection = false;
}
int wxComboBox::GetSelection (void) const
return wxDoGetSelectionInList( GetXmList( this ) );
}
-wxString wxComboBox::GetString(int n) const
+wxString wxComboBox::GetString(unsigned int n) const
{
return wxDoGetStringInList( GetXmList(this), n );
}
-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
+
return wxDoFindStringInList( GetXmList( this ), s );
}
return (long)XmTextGetInsertionPosition( GetXmText(this) );
}
-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const
{
XmTextPosition pos = XmTextGetLastPosition( GetXmText(this) );
return (long)pos;
void wxComboBox::Replace(long from, long to, const wxString& value)
{
XmTextReplace( GetXmText(this), (XmTextPosition)from, (XmTextPosition)to,
- (char*)value.c_str() );
+ value.char_str() );
}
void wxComboBox::Remove(long from, long to)
{
wxComboBox *item = (wxComboBox *) clientData;
+ if( item->m_inSetSelection ) return;
+
switch (cbs->reason)
{
case XmCR_SELECT:
{
wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED,
item->GetId());
- int idx = cbs->item_position - 1;
- event.m_commandInt = idx;
- event.m_commandString = item->GetString (idx);
+ int idx = cbs->item_position;
+ event.SetInt(idx);
+ event.SetString( item->GetString (idx) );
if ( item->HasClientObjectData() )
event.SetClientObject( item->GetClientObject(idx) );
else if ( item->HasClientUntypedData() )
event.SetClientData( item->GetClientData(idx) );
- event.m_extraLong = true;
+ event.SetExtraLong(true);
event.SetEventObject(item);
- item->ProcessCommand (event);
+ item->GetEventHandler()->ProcessEvent(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);
+ item->GetEventHandler()->ProcessEvent(event);
break;
}
default:
void wxComboBox::ChangeFont(bool keepOriginalSize)
{
- if( m_font.Ok() )
+ if( m_font.Ok() && m_mainWidget != NULL )
{
wxDoChangeFont( GetXmText(this), m_font );
wxDoChangeFont( GetXmList(this), m_font );
projects / wxWidgets.git / blobdiff