// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#include "wx/defs.h"
+
+#if wxUSE_CHOICE
+
#ifndef WX_PRECOMP
#include "wx/choice.h"
#include "wx/utils.h"
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+bool wxChoice::Create(
+ wxWindow* pParent
+, wxWindowID vId
+, const wxPoint& rPos
+, const wxSize& rSize
+, const wxArrayString& asChoices
+, long lStyle
+, const wxValidator& rValidator
+, const wxString& rsName
+)
+{
+ wxCArrayString chs(asChoices);
+
+ return Create(pParent, vId, rPos, rSize, chs.GetCount(), chs.GetStrings(),
+ lStyle, rValidator, rsName);
+}
+
bool wxChoice::Create(
wxWindow* pParent
, wxWindowID vId
, int n
, const wxString asChoices[]
, long lStyle
-#if wxUSE_VALIDATORS
, const wxValidator& rValidator
-#endif
, const wxString& rsName
)
{
long lSstyle;
- if (!OS2CreateControl( pParent
- ,vId
- ,rPos
- ,rSize
- ,lStyle
-#if wxUSE_VALIDATORS
- ,rValidator
-#endif
- ,rsName
- ))
- return FALSE;
+ if (!CreateControl( pParent
+ ,vId
+ ,rPos
+ ,rSize
+ ,lStyle
+ ,rValidator
+ ,rsName
+ ))
+ return false;
lSstyle = CBS_DROPDOWNLIST |
WS_TABSTOP |
WS_VISIBLE;
if (!OS2CreateControl( wxT("COMBOBOX")
,lSstyle
))
- return FALSE;
+ return false;
//
// A choice/combobox normally has a white background (or other, depending
,rSize.y
);
delete pTextFont;
- return TRUE;
+ return true;
} // end of wxChoice::Create
// ----------------------------------------------------------------------------
)
{
int nIndex;
- SHORT nIndexType = 0;
+ LONG nIndexType = 0;
if (m_windowStyle & wxLB_SORT)
nIndexType = LIT_SORTASCENDING;
return nIndex;
} // end of wxChoice::DoAppend
+int wxChoice::DoInsert(
+ const wxString& rsItem,
+ 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(rsItem);
+
+ int nIndex;
+ LONG nIndexType = 0;
+
+ if (m_windowStyle & wxLB_SORT)
+ nIndexType = LIT_SORTASCENDING;
+ else
+ nIndexType = pos;
+ nIndex = (int)::WinSendMsg( GetHwnd()
+ ,LM_INSERTITEM
+ ,(MPARAM)nIndexType
+ ,(MPARAM)rsItem.c_str()
+ );
+ return nIndex;
+} // end of wxChoice::DoInsert
+
void wxChoice::Delete(
int n
)
nTextLength = (int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)nPos, (MPARAM)0));
zStr = new char[nTextLength + 1];
::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)nPos, (SHORT)nTextLength), (MPARAM)zStr);
- if (rsStr == (char*)zStr)
+ if (rsStr == (wxChar*)zStr)
{
delete [] zStr;
break;
, const wxString& rsStr
)
{
- wxFAIL_MSG(wxT("not implemented"));
+ LONG nIndexType = 0;
+ void* pData;
-#if 0 // should do this, but no Insert() so far
- Delete(n);
- Insert(n + 1, s);
-#endif
+ if ( m_clientDataItemsType != wxClientData_None )
+ {
+ pData = DoGetItemClientData(n);
+ }
+ else // no client data
+ {
+ pData = NULL;
+ }
+
+ ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, 0);
+
+ if (m_windowStyle & wxLB_SORT)
+ nIndexType = LIT_SORTASCENDING;
+ else
+ nIndexType = LIT_END;
+ ::WinSendMsg( GetHwnd()
+ ,LM_INSERTITEM
+ ,(MPARAM)nIndexType
+ ,(MPARAM)rsStr.c_str()
+ );
+
+ if (pData)
+ {
+ DoSetItemClientData( n
+ ,pData
+ );
+ }
} // end of wxChoice::SetString
wxString wxChoice::GetString(
int n
) const
{
- size_t nLen = 0;
- wxString sStr = "";
- char* zBuf;
+ int nLen = 0;
+ wxString sStr = wxEmptyString;
+ wxChar* zBuf;
nLen = (size_t)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0));
- if (nLen)
+ if (nLen != LIT_ERROR && nLen > 0)
{
- zBuf = new char[nLen + 1];
+ zBuf = new wxChar[nLen + 1];
::WinSendMsg( GetHwnd()
,LM_QUERYITEMTEXT
,MPFROM2SHORT((SHORT)n, (SHORT)nLen)
//
// Ignore height parameter because height doesn't mean 'initially
// displayed' height, it refers to the drop-down menu as well. The
- // wxWindows interpretation is different; also, getting the size returns
+ // wxWidgets interpretation is different; also, getting the size returns
// the _displayed_ size (NOT the drop down menu size) so
// setting-getting-setting size would not work.
//
int nItems = GetCount();
int nCx;
int nCy;
+ wxFont vFont = (wxFont)GetFont();
for (int i = 0; i < nItems; i++)
{
wxGetCharSize( GetHWND()
,&nCx
,&nCy
- ,(wxFont*)&GetFont()
+ ,&vFont
);
nChoiceWidth += 5 * nCx;
//
// "selection changed" is the only event we're after
//
- return FALSE;
+ return false;
}
int n = GetSelection();
vEvent.SetInt(n);
vEvent.SetEventObject(this);
- vEvent.SetString((char*)GetStringSelection().c_str());
+ vEvent.SetString(GetStringSelection());
if (HasClientObjectData())
vEvent.SetClientObject(GetClientObject(n));
else if (HasClientUntypedData())
vEvent.SetClientData(GetClientData(n));
ProcessCommand(vEvent);
}
- return TRUE;
+ return true;
} // end of wxChoice::OS2Command
void wxChoice::Free()
delete GetClientObject(n);
}
}
-} // end of wxhoice::Free
+} // end of wxChoice::Free
+
+#endif // wxUSE_CHOICE