/////////////////////////////////////////////////////////////////////////////
-// Name: choice.cpp
+// Name: src/os2/choice.cpp
// Purpose: wxChoice
// Author: David Webster
// Modified by:
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/defs.h"
-
#if wxUSE_CHOICE
+#include "wx/choice.h"
+
#ifndef WX_PRECOMP
- #include "wx/choice.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/settings.h"
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) &&
// on global settings) rather than inheriting the parent's background colour.
//
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+
+ // initialize the controls contents
for (int i = 0; i < n; i++)
{
Append(asChoices[i]);
}
- wxFont* pTextFont = new wxFont( 10
- ,wxMODERN
- ,wxNORMAL
- ,wxNORMAL
- );
- SetFont(*pTextFont);
SetSize( rPos.x
,rPos.y
,rSize.x
,rSize.y
);
- delete pTextFont;
+
+ // 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();
+}
+
// ----------------------------------------------------------------------------
// adding/deleting items to/from the list
// ----------------------------------------------------------------------------
{
int nIndex;
LONG nIndexType = 0;
-
- if (m_windowStyle & wxLB_SORT)
+ if (m_windowStyle & wxCB_SORT)
nIndexType = LIT_SORTASCENDING;
else
nIndexType = LIT_END;
nIndex = (int)::WinSendMsg( GetHwnd()
,LM_INSERTITEM
,(MPARAM)nIndexType
- ,(MPARAM)rsItem.c_str()
+ ,(MPARAM)rsItem.wx_str()
);
return nIndex;
} // end of wxChoice::DoAppend
-int wxChoice::DoInsert(
- const wxString& rsItem,
- int pos
-)
+int wxChoice::DoInsert( const wxString& rsItem, unsigned 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"));
+ wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
if (pos == GetCount())
return DoAppend(rsItem);
- int nIndex;
- LONG nIndexType = 0;
+ int nIndex;
+ LONG nIndexType = 0;
- if (m_windowStyle & wxLB_SORT)
+ if (m_windowStyle & wxCB_SORT)
nIndexType = LIT_SORTASCENDING;
else
nIndexType = pos;
nIndex = (int)::WinSendMsg( GetHwnd()
,LM_INSERTITEM
,(MPARAM)nIndexType
- ,(MPARAM)rsItem.c_str()
+ ,(MPARAM)rsItem.wx_str()
);
return nIndex;
} // end of wxChoice::DoInsert
-void wxChoice::Delete(
- int n
-)
+void wxChoice::Delete(unsigned int n)
{
- wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
+ 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
// string list functions
// ----------------------------------------------------------------------------
-int wxChoice::GetCount() const
+unsigned int wxChoice::GetCount() const
{
- return((int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0)));
+ return((unsigned int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0)));
} // end of wxChoice::GetCount
-int wxChoice::FindString(
- const wxString& rsStr
-) const
+void wxChoice::SetString(unsigned int n, const wxString& rsStr)
{
- int nPos;
- int nTextLength;
- PSZ zStr;
- int nItemCount;
-
- nItemCount = (int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0));
- for (nPos = 0; nPos < nItemCount; nPos++)
- {
- 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 == (wxChar*)zStr)
- {
- delete [] zStr;
- break;
- }
- delete [] zStr;
- }
- return nPos;
-} // end of wxChoice::FindString
-
-void wxChoice::SetString(
- int n
-, const wxString& rsStr
-)
-{
- LONG nIndexType = 0;
- void* pData;
+ LONG nIndexType = 0;
+ void* pData;
if ( m_clientDataItemsType != wxClientData_None )
{
::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)
{
- DoSetItemClientData( n
- ,pData
- );
+ DoSetItemClientData(n, pData);
}
} // end of wxChoice::SetString
-wxString wxChoice::GetString(
- int n
-) const
+wxString wxChoice::GetString(unsigned int n) const
{
- int nLen = 0;
- wxString sStr = wxEmptyString;
- wxChar* zBuf;
+ int nLen = 0;
+ wxString sStr = wxEmptyString;
+ wxChar* zBuf;
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)
// client data
// ----------------------------------------------------------------------------
-void wxChoice::DoSetItemClientData(
- int n
-, void* pClientData
-)
+void wxChoice::DoSetItemClientData(unsigned int n, void* pClientData)
{
::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)n, MPFROMP(pClientData));
} // end of wxChoice::DoSetItemClientData
-void* wxChoice::DoGetItemClientData( int n ) const
+void* wxChoice::DoGetItemClientData(unsigned int n) const
{
- MRESULT rc = 0L;
-
- rc = ::WinSendMsg(GetHwnd(), LM_QUERYITEMHANDLE, (MPARAM)n, (MPARAM)0);
+ MRESULT rc = ::WinSendMsg(GetHwnd(), LM_QUERYITEMHANDLE, (MPARAM)n, (MPARAM)0);
return((void*)rc);
-} // end of wxChoice::DoSetItemClientData
+} // end of wxChoice::DoGetItemClientData
-void wxChoice::DoSetItemClientObject(
- int n
-, wxClientData* pClientData
-)
+void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* pClientData)
{
- DoSetItemClientData( n
- ,pClientData
- );
+ DoSetItemClientData(n, pClientData);
} // end of wxChoice::DoSetItemClientObject
-wxClientData* wxChoice::DoGetItemClientObject(
- int n
-) const
+wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const
{
return (wxClientData *)DoGetItemClientData(n);
} // end of wxChoice::DoGetItemClientObject
// wxOS2 specific helpers
// ----------------------------------------------------------------------------
-void wxChoice::DoSetSize(
- int nX
-, int nY
-, int nWidth
-, int nHeight
-, int nSizeFlags
-)
+void wxChoice::DoSetSize(int nX,
+ int nY,
+ int nWidth,
+ int WXUNUSED(nHeight),
+ int nSizeFlags)
{
//
// Ignore height parameter because height doesn't mean 'initially
wxControl::DoSetSize( nX
,nY
,nWidth
- ,-1
+ ,wxDefaultCoord
,nSizeFlags
);
} // end of wxChoice::DoSetSize
//
// Find the widest string
//
- int nLineWidth;
- int nChoiceWidth = 0;
- int nItems = GetCount();
- int nCx;
- int nCy;
- wxFont vFont = (wxFont)GetFont();
-
- for (int i = 0; i < nItems; i++)
- {
- wxString sStr(GetString(i));
+ int nLineWidth;
+ int nChoiceWidth = 0;
+ int nCx;
+ int nCy;
+ wxFont vFont = (wxFont)GetFont();
- GetTextExtent( sStr
- ,&nLineWidth
- ,NULL
- );
+ const unsigned int nItems = GetCount();
+
+ for (unsigned int i = 0; i < nItems; i++)
+ {
+ wxString sStr(GetString(i));
+ GetTextExtent( sStr, &nLineWidth, NULL );
if (nLineWidth > nChoiceWidth)
nChoiceWidth = nLineWidth;
}
//
// The combobox should be larger than the widest string
//
- wxGetCharSize( GetHWND()
- ,&nCx
- ,&nCy
- ,&vFont
- );
+ wxGetCharSize( GetHWND(), &nCx, &nCy, &vFont );
nChoiceWidth += 5 * nCx;
//
// Choice drop-down list depends on number of items (limited to 10)
//
- size_t nStrings = nItems == 0 ? 10 : wxMin(10, nItems) + 1;
- int nChoiceHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * nStrings;
+ size_t nStrings = nItems == 0 ? 10 : wxMin(10, nItems) + 1;
+ int nChoiceHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * nStrings;
- return wxSize( nChoiceWidth
- ,nChoiceHeight
- );
+ return wxSize(nChoiceWidth, nChoiceHeight);
} // end of wxChoice::DoGetBestSize
MRESULT wxChoice::OS2WindowProc(
{
if (HasClientObjectData())
{
- size_t nCount = GetCount();
+ const unsigned int nCount = GetCount();
- for (size_t n = 0; n < nCount; n++)
+ for (unsigned int n = 0; n < nCount; n++)
{
delete GetClientObject(n);
}
projects / wxWidgets.git / blobdiff