AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement wxChoice::Insert.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon 2005-09-28 21:16:27 +00:00
parent c228fcb438
commit f94a81c084
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/motif/choice.cpp
View File

@ -183,13 +183,25 @@ wxChoice::~wxChoice()
m_clientDataDict.DestroyData(); m_clientDataDict.DestroyData();
} }
int wxChoice::DoAppend(const wxString& item) static inline wxChar* MYcopystring(const wxChar* s)
{ {
wxChar* copy = new wxChar[wxStrlen(s) + 1];
return wxStrcpy(copy, s);
}
int wxChoice::DoInsert(const wxString& item, int pos)
{
#ifndef XmNpositionIndex
wxCHECK_MSG( pos == GetCount(), -1, wxT("insert not implemented"));
#endif
Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item), Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
#if wxUSE_GADGETS #if wxUSE_GADGETS
xmPushButtonGadgetClass, (Widget) m_menuWidget, xmPushButtonGadgetClass, (Widget) m_menuWidget,
#else #else
xmPushButtonWidgetClass, (Widget) m_menuWidget, xmPushButtonWidgetClass, (Widget) m_menuWidget,
#endif
#ifdef XmNpositionIndex
XmNpositionIndex, pos,
#endif #endif
NULL); NULL);
@ -198,7 +210,7 @@ int wxChoice::DoAppend(const wxString& item)
if( m_font.Ok() ) if( m_font.Ok() )
wxDoChangeFont( w, m_font ); wxDoChangeFont( w, m_font );
m_widgetArray.Add(w); m_widgetArray.Insert(w, pos);
char mnem = wxFindMnemonic (item); char mnem = wxFindMnemonic (item);
if (mnem != 0) if (mnem != 0)
@ -217,18 +229,16 @@ int wxChoice::DoAppend(const wxString& item)
XmNlabelString, text(), XmNlabelString, text(),
NULL); NULL);
} }
m_stringList.Add(item); // need to ditch wxStringList for wxArrayString
m_stringList.Insert(pos, MYcopystring(item));
m_noStrings ++; m_noStrings ++;
return GetCount() - 1; return pos;
} }
int wxChoice::DoInsert(const wxString& item, int pos) int wxChoice::DoAppend(const wxString& item)
{ {
wxCHECK_MSG(false, -1, wxT("insert not implemented")); return DoInsert(item, GetCount());
// wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
// if (pos == GetCount()) return DoAppend(item);
} }
void wxChoice::Delete(int n) void wxChoice::Delete(int n)