/////////////////////////////////////////////////////////////////////////////
-// Name: choice.cpp
+// Name: src/motif/choice.cpp
// Purpose: wxChoice
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "choice.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_CHOICE
#ifdef __VMS
#define XtDisplay XTDISPLAY
#define XtParent XTPARENT
#endif
-#include "wx/defs.h"
-
#include "wx/choice.h"
-#include "wx/utils.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+ #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;
Widget parentWidget = (Widget) parent->GetClientWidget();
* Create the popup menu
*/
m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget,
- "choiceMenu", NULL, 0);
+ wxMOTIF_STR("choiceMenu"),
+ NULL, 0);
if (n > 0)
{
XtSetArg (args[argcnt], XmNmarginHeight, 0); ++argcnt;
XtSetArg (args[argcnt], XmNpacking, XmPACK_TIGHT); ++argcnt;
m_buttonWidget = (WXWidget) XmCreateOptionMenu ((Widget) m_formWidget,
- "choiceButton",
+ wxMOTIF_STR("choiceButton"),
args, argcnt);
m_mainWidget = m_buttonWidget;
XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
- ChangeFont(FALSE);
+ ChangeFont(false);
ChangeBackgroundColour();
AttachWidget (parent, m_buttonWidget, m_formWidget,
pos.x, pos.y, bestSize.x, bestSize.y);
- return TRUE;
+ return true;
}
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
m_clientDataDict.DestroyData();
}
-int wxChoice::DoAppend(const wxString& item)
+static inline wxChar* MYcopystring(const wxChar* s)
{
- Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
-#if USE_GADGETS
+ wxChar* copy = new wxChar[wxStrlen(s) + 1];
+ return wxStrcpy(copy, s);
+}
+
+int wxChoice::DoInsert(const wxString& item, unsigned int pos)
+{
+#ifndef XmNpositionIndex
+ wxCHECK_MSG( pos == GetCount(), -1, wxT("insert not implemented"));
+#endif
+ Widget w = XtVaCreateManagedWidget (GetLabelText(item),
+#if wxUSE_GADGETS
xmPushButtonGadgetClass, (Widget) m_menuWidget,
#else
xmPushButtonWidgetClass, (Widget) m_menuWidget,
+#endif
+#ifdef XmNpositionIndex
+ XmNpositionIndex, pos,
#endif
NULL);
if( m_font.Ok() )
wxDoChangeFont( w, m_font );
- m_widgetArray.Add(w);
+ m_widgetArray.Insert(w, pos);
char mnem = wxFindMnemonic (item);
if (mnem != 0)
XmNlabelString, text(),
NULL);
}
- m_stringList.Add(item);
+ // need to ditch wxStringList for wxArrayString
+ m_stringList.Insert(pos, MYcopystring(item));
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"));
-
-// wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
-// if (pos == GetCount()) return DoAppend(item);
+ return DoInsert(item, GetCount());
}
-void wxChoice::Delete(int n)
+void wxChoice::Delete(unsigned int n)
{
Widget w = (Widget)m_widgetArray[n];
XtRemoveCallback(w, XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,
m_clientDataDict.Delete(n, HasClientObjectData());
XtDestroyWidget(w);
- m_noStrings --;
+ m_noStrings--;
}
void wxChoice::Clear()
{
m_stringList.Clear ();
- size_t i;
+ unsigned int i;
for (i = 0; i < m_noStrings; i++)
{
XtRemoveCallback((Widget) m_widgetArray[i],
wxXmString freeMe(text);
wxString s = wxXmStringToString( text );
- if (!s.IsEmpty())
+ if (!s.empty())
{
int i = 0;
for (wxStringList::compatibility_iterator node = m_stringList.GetFirst ();
void wxChoice::SetSelection(int n)
{
- m_inSetValue = TRUE;
+ m_inSetValue = true;
wxStringList::compatibility_iterator node = m_stringList.Item(n);
if (node)
XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
#endif
}
- m_inSetValue = FALSE;
+ m_inSetValue = false;
}
-int wxChoice::FindString(const wxString& s) const
-{
- int i = 0;
- for (wxStringList::compatibility_iterator node = m_stringList.GetFirst();
- node; node = node->GetNext ())
- {
- if (s == node->GetData())
- return i;
-
- i++;
- }
-
- return -1;
-}
-
-wxString wxChoice::GetString(int n) const
+wxString wxChoice::GetString(unsigned int n) const
{
wxStringList::compatibility_iterator node = m_stringList.Item(n);
if (node)
{
if (n<1) n = 1 ;
- short numColumns = n ;
+ short numColumns = (short)n ;
Arg args[3];
XtSetArg(args[0], XmNnumColumns, numColumns);
if (width > -1)
{
- size_t i;
+ unsigned int i;
for (i = 0; i < m_noStrings; i++)
XtVaSetValues ((Widget) m_widgetArray[i],
XmNwidth, actualWidth,
if (height > -1)
{
#if 0
- size_t i;
+ unsigned int i;
for (i = 0; i < m_noStrings; i++)
XtVaSetValues ((Widget) m_widgetArray[i],
XmNheight, actualHeight,
{
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, item->GetId());
event.SetEventObject(item);
- event.m_commandInt = n;
- event.m_commandString = item->GetStrings().Item(n)->GetData();
+ event.SetInt(n);
+ event.SetString( item->GetStrings().Item(n)->GetData() );
if ( item->HasClientObjectData() )
event.SetClientObject( item->GetClientObject(n) );
else if ( item->HasClientUntypedData() )
// back again. TODO: a better way in Motif?
if (m_font.Ok())
{
+ Display* dpy = XtDisplay((Widget) m_mainWidget);
int width, height, width1, height1;
GetSize(& width, & height);
- WXFontType fontType =
- m_font.GetFontType(XtDisplay((Widget) m_mainWidget));
WXString fontTag = wxFont::GetFontTag();
- XtVaSetValues ((Widget) m_formWidget, fontTag, fontType, NULL);
- XtVaSetValues ((Widget) m_buttonWidget, fontTag, fontType, NULL);
+ XtVaSetValues ((Widget) m_formWidget,
+ fontTag, m_font.GetFontTypeC(dpy),
+ NULL);
+ XtVaSetValues ((Widget) m_buttonWidget,
+ fontTag, m_font.GetFontTypeC(dpy),
+ NULL);
- for( size_t i = 0; i < m_noStrings; ++i )
+ for( unsigned int i = 0; i < m_noStrings; ++i )
XtVaSetValues( (Widget)m_widgetArray[i],
- fontTag, fontType,
+ fontTag, m_font.GetFontTypeC(dpy),
NULL );
-
+
GetSize(& width1, & height1);
if (keepOriginalSize && (width != width1 || height != height1))
{
- SetSize(-1, -1, width, height);
+ SetSize(wxDefaultCoord, wxDefaultCoord, width, height);
}
}
}
wxDoChangeBackgroundColour(m_formWidget, m_backgroundColour);
wxDoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
wxDoChangeBackgroundColour(m_menuWidget, m_backgroundColour);
- size_t i;
+ unsigned int i;
for (i = 0; i < m_noStrings; i++)
wxDoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);
}
wxDoChangeForegroundColour(m_formWidget, m_foregroundColour);
wxDoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
wxDoChangeForegroundColour(m_menuWidget, m_foregroundColour);
- size_t i;
+ unsigned int i;
for (i = 0; i < m_noStrings; i++)
wxDoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);
}
-int wxChoice::GetCount() const
+unsigned int wxChoice::GetCount() const
{
return m_noStrings;
}
-void wxChoice::DoSetItemClientData(int n, void* clientData)
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
{
- m_clientDataDict.Set(n, (wxClientData*)clientData, FALSE);
+ m_clientDataDict.Set(n, (wxClientData*)clientData, false);
}
-void* wxChoice::DoGetItemClientData(int n) const
+void* wxChoice::DoGetItemClientData(unsigned int n) const
{
return (void*)m_clientDataDict.Get(n);
}
-void wxChoice::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
{
// don't delete, wxItemContainer does that for us
- m_clientDataDict.Set(n, clientData, FALSE);
+ m_clientDataDict.Set(n, clientData, false);
}
-wxClientData* wxChoice::DoGetItemClientObject(int n) const
+wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const
{
return m_clientDataDict.Get(n);
}
-void wxChoice::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s))
+void wxChoice::SetString(unsigned int WXUNUSED(n), const wxString& WXUNUSED(s))
{
wxFAIL_MSG( wxT("wxChoice::SetString not implemented") );
}
return wxSize( ( items.x ? items.x + WIDTH_OVERHEAD : 120 ),
items.y + HEIGHT_OVERHEAD );
}
+
+#endif // wxUSE_CHOICE
projects / wxWidgets.git / blobdiff