X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cf6acbf261c5d47f97d280700b1203f3d8d8047..bd1a4a99fc1bec4ac5d0b14379dc5345d6ce3253:/src/os2/choice.cpp diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp index 0597080b72..cea4402332 100644 --- a/src/os2/choice.cpp +++ b/src/os2/choice.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.cpp +// Name: src/os2/choice.cpp // Purpose: wxChoice // Author: David Webster // Modified by: @@ -12,16 +12,38 @@ // 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" #include "wx/log.h" + #include "wx/settings.h" #endif #include "wx/os2/private.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 @@ -30,28 +52,24 @@ bool wxChoice::Create( , 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; + WS_TABSTOP | + WS_VISIBLE; if (lStyle & wxCLIP_SIBLINGS ) lSstyle |= WS_CLIPSIBLINGS; @@ -65,13 +83,13 @@ bool wxChoice::Create( if (!OS2CreateControl( wxT("COMBOBOX") ,lSstyle )) - return FALSE; + return false; // // A choice/combobox normally has a white background (or other, depending // on global settings) rather than inheriting the parent's background colour. // - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); for (int i = 0; i < n; i++) { Append(asChoices[i]); @@ -81,8 +99,7 @@ bool wxChoice::Create( ,rSize.x ,rSize.y ); - - return TRUE; + return true; } // end of wxChoice::Create // ---------------------------------------------------------------------------- @@ -94,7 +111,7 @@ int wxChoice::DoAppend( ) { int nIndex; - SHORT nIndexType = 0; + LONG nIndexType = 0; if (m_windowStyle & wxLB_SORT) nIndexType = LIT_SORTASCENDING; @@ -108,6 +125,32 @@ int wxChoice::DoAppend( 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 ) @@ -151,56 +194,50 @@ int wxChoice::GetCount() const return((int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0))); } // end of wxChoice::GetCount -int wxChoice::FindString( - const wxString& rsStr -) const +void wxChoice::SetString( int n, const wxString& rsStr ) { - int nPos; - int nTextLength; - PSZ zStr; - int nItemCount; + LONG nIndexType = 0; + void* pData; - nItemCount = (int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0)); - for (nPos = 0; nPos < nItemCount; nPos++) + if ( m_clientDataItemsType != wxClientData_None ) { - 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) - { - delete [] zStr; - break; - } - delete [] zStr; + pData = DoGetItemClientData(n); + } + else // no client data + { + pData = NULL; } - return nPos; -} // end of wxChoice::FindString -void wxChoice::SetString( - int n -, const wxString& rsStr -) -{ - wxFAIL_MSG(wxT("not implemented")); + ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, 0); -#if 0 // should do this, but no Insert() so far - Delete(n); - Insert(n + 1, s); -#endif + 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 +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) @@ -253,25 +290,23 @@ wxClientData* 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 // 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. // wxControl::DoSetSize( nX ,nY ,nWidth - ,-1 + ,wxDefaultCoord ,nSizeFlags ); } // end of wxChoice::DoSetSize @@ -286,6 +321,7 @@ wxSize wxChoice::DoGetBestSize() const int nItems = GetCount(); int nCx; int nCy; + wxFont vFont = (wxFont)GetFont(); for (int i = 0; i < nItems; i++) { @@ -312,7 +348,7 @@ wxSize wxChoice::DoGetBestSize() const wxGetCharSize( GetHWND() ,&nCx ,&nCy - ,(wxFont*)&GetFont() + ,&vFont ); nChoiceWidth += 5 * nCx; @@ -349,7 +385,7 @@ bool wxChoice::OS2Command( // // "selection changed" is the only event we're after // - return FALSE; + return false; } int n = GetSelection(); @@ -361,14 +397,14 @@ bool wxChoice::OS2Command( 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() @@ -382,4 +418,6 @@ void wxChoice::Free() delete GetClientObject(n); } } -} // end of wxhoice::Free +} // end of wxChoice::Free + +#endif // wxUSE_CHOICE