// Author: David Webster
// Modified by:
// Created: 10/13/99
-// RCS-ID: $Id$
// Copyright: (c) David Webster
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/os2/private.h"
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-
bool wxChoice::Create(
wxWindow* pParent
, wxWindowID vId
WS_TABSTOP |
WS_VISIBLE;
- if (lStyle & wxCLIP_SIBLINGS )
- lSstyle |= WS_CLIPSIBLINGS;
+ // clipping siblings does not yet work
+ // if (lStyle & wxCLIP_SIBLINGS )
+ // lSstyle |= WS_CLIPSIBLINGS;
wxASSERT_MSG( !(lStyle & wxCB_DROPDOWN) &&
!(lStyle & wxCB_READONLY) &&
,rSize.x
,rSize.y
);
+
+ // Set height to use with sizers i.e. without the dropdown listbox
+ wxFont vFont = GetFont();
+ int nEditHeight;
+ wxGetCharSize( GetHWND(), NULL, &nEditHeight, &vFont );
+ nEditHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nEditHeight);
+ SetInitialSize(wxSize(-1,nEditHeight+4)); // +2x2 for the border
+
return true;
} // end of wxChoice::Create
wxChoice::~wxChoice()
{
- Free();
+ Clear();
}
// ----------------------------------------------------------------------------
// adding/deleting items to/from the list
// ----------------------------------------------------------------------------
-int wxChoice::DoAppend(
- const wxString& rsItem
-)
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items
+ , unsigned int pos
+ , void **clientData
+ , wxClientDataType type
+ )
{
- int nIndex;
+ int nIndex = wxNOT_FOUND;
LONG nIndexType = 0;
-
- if (m_windowStyle & wxLB_SORT)
+ bool incrementPos = false;
+ if ( IsSorted() )
nIndexType = LIT_SORTASCENDING;
- else
+ else if (pos == GetCount())
nIndexType = LIT_END;
- nIndex = (int)::WinSendMsg( GetHwnd()
- ,LM_INSERTITEM
- ,(MPARAM)nIndexType
- ,(MPARAM)rsItem.c_str()
- );
- return nIndex;
-} // end of wxChoice::DoAppend
-
-int wxChoice::DoInsert( const wxString& rsItem, 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(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()
- );
+ incrementPos = true;
+ }
+
+ const unsigned int count = items.GetCount();
+ for( unsigned int i = 0; i < count; ++i )
+ {
+ nIndex = (int)::WinSendMsg( GetHwnd()
+ ,LM_INSERTITEM
+ ,(MPARAM)nIndexType
+ ,(MPARAM)items[i].wx_str()
+ );
+ if (nIndex < 0)
+ {
+ nIndex = wxNOT_FOUND;
+ break;
+ }
+ AssignNewItemClientData(nIndex, clientData, i, type);
+
+ if (incrementPos)
+ ++nIndexType;
+ }
return nIndex;
-} // end of wxChoice::DoInsert
+} // end of wxChoice::DoInsertAppendItemsWithData
-void wxChoice::Delete(unsigned int n)
+void wxChoice::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::Delete") );
- if ( HasClientObjectData() )
- {
- delete GetClientObject(n);
- }
-
::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, (MPARAM)0);
} // end of wxChoice::Delete
-void wxChoice::Clear()
+void wxChoice::DoClear()
{
- Free();
::WinSendMsg(GetHwnd(), LM_DELETEALL, (MPARAM)0, (MPARAM)0);
} // end of wxChoice::Clear
// ----------------------------------------------------------------------------
int wxChoice::GetSelection() const
-{
- // if m_lastAcceptedSelection is set, it means that the dropdown is
- // currently shown and that we want to use the last "permanent" selection
- // instead of whatever is under the mouse pointer currently
- //
- // otherwise, get the selection from the control
- return m_lastAcceptedSelection == wxID_NONE ? GetCurrentSelection()
- : m_lastAcceptedSelection;
-}
-
-int wxChoice::GetCurrentSelection() const
{
return((int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0)));
} // end of wxChoice::GetSelection
LONG nIndexType = 0;
void* pData;
- if ( m_clientDataItemsType != wxClientData_None )
+ if ( HasClientData() )
{
pData = DoGetItemClientData(n);
}
::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, 0);
- if (m_windowStyle & wxLB_SORT)
+ if (m_windowStyle & wxCB_SORT)
nIndexType = LIT_SORTASCENDING;
else
nIndexType = LIT_END;
::WinSendMsg( GetHwnd()
,LM_INSERTITEM
,(MPARAM)nIndexType
- ,(MPARAM)rsStr.c_str()
+ ,(MPARAM)rsStr.wx_str()
);
if (pData)
nLen = (size_t)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0));
if (nLen != LIT_ERROR && nLen > 0)
{
- zBuf = new wxChar[nLen + 1];
+ zBuf = new wxChar[++nLen];
::WinSendMsg( GetHwnd()
,LM_QUERYITEMTEXT
,MPFROM2SHORT((SHORT)n, (SHORT)nLen)
return((void*)rc);
} // end of wxChoice::DoGetItemClientData
-void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* pClientData)
-{
- DoSetItemClientData(n, pClientData);
-} // end of wxChoice::DoSetItemClientObject
-
-wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const
-{
- return (wxClientData *)DoGetItemClientData(n);
-} // end of wxChoice::DoGetItemClientObject
-
// ----------------------------------------------------------------------------
// wxOS2 specific helpers
// ----------------------------------------------------------------------------
if (n > -1)
{
- wxCommandEvent vEvent( wxEVT_COMMAND_CHOICE_SELECTED
+ wxCommandEvent vEvent( wxEVT_CHOICE
,m_windowId
);
return true;
} // end of wxChoice::OS2Command
-void wxChoice::Free()
-{
- if (HasClientObjectData())
- {
- const unsigned int nCount = GetCount();
-
- for (unsigned int n = 0; n < nCount; n++)
- {
- delete GetClientObject(n);
- }
- }
-} // end of wxChoice::Free
-
#endif // wxUSE_CHOICE
projects / wxWidgets.git / blobdiff