X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d598bae33dff0e48eebd569aa3d75e95e8d6947..37ddd6ea64d7faae1201740ea5f6eb7050189611:/src/os2/listbox.cpp?ds=sidebyside diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp index 1d49e7c601..688ccfbf51 100644 --- a/src/os2/listbox.cpp +++ b/src/os2/listbox.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: listbox.cpp +// Name: src/os2/listbox.cpp // Purpose: wxListBox // Author: David Webster // Modified by: @@ -12,33 +12,34 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/window.h" -#include "wx/os2/private.h" +#if wxUSE_LISTBOX -#ifndef WX_PRECOMP #include "wx/listbox.h" -#include "wx/settings.h" -#include "wx/brush.h" -#include "wx/font.h" -#include "wx/dc.h" -#include "wx/dcscreen.h" -#include "wx/utils.h" -#include "wx/scrolwin.h" + +#ifndef WX_PRECOMP + #include "wx/dynarray.h" + #include "wx/settings.h" + #include "wx/brush.h" + #include "wx/font.h" + #include "wx/dc.h" + #include "wx/dcscreen.h" + #include "wx/utils.h" + #include "wx/scrolwin.h" + #include "wx/log.h" + #include "wx/window.h" #endif +#include "wx/os2/dcclient.h" +#include "wx/os2/private.h" + #define INCL_M #include -#include "wx/dynarray.h" -#include "wx/log.h" - -#if wxUSE_LISTBOX - #if wxUSE_OWNER_DRAWN #include "wx/ownerdrw.h" #endif - IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) // ============================================================================ // list box item declaration and implementation @@ -49,7 +50,7 @@ class wxListBoxItem : public wxOwnerDrawn { public: - wxListBoxItem(const wxString& rsStr = ""); + wxListBoxItem(const wxString& rsStr = wxEmptyString); }; wxListBoxItem::wxListBoxItem( @@ -65,9 +66,7 @@ wxListBoxItem::wxListBoxItem( SetMarginWidth(0); } // end of wxListBoxItem::wxListBoxItem -wxOwnerDrawn* wxListBox::CreateItem( - size_t n -) +wxOwnerDrawn* wxListBox::CreateItem( size_t WXUNUSED(n) ) { return new wxListBoxItem(); } // end of wxListBox::CreateItem @@ -102,17 +101,15 @@ bool wxListBox::Create( lStyle, rValidator, rsName); } -bool wxListBox::Create( - wxWindow* pParent -, wxWindowID vId -, const wxPoint& rPos -, const wxSize& rSize -, int n -, const wxString asChoices[] -, long lStyle -, const wxValidator& rValidator -, const wxString& rsName -) +bool wxListBox::Create( wxWindow* pParent, + wxWindowID vId, + const wxPoint& rPos, + const wxSize& rSize, + int n, + const wxString asChoices[], + long lStyle, + const wxValidator& rValidator, + const wxString& rsName ) { m_nNumItems = 0; m_hWnd = 0; @@ -194,11 +191,11 @@ bool wxListBox::Create( SetFont(*pTextFont); // - // Set standard wxWidgets colors for Listbox items and highlighting + // Set OS/2 system colours for Listbox items and highlighting // wxColour vColour; - vColour.Set(wxString("WHITE")); + vColour = wxSystemSettingsNative::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); LONG lColor = (LONG)vColour.GetPixel(); @@ -207,7 +204,7 @@ bool wxListBox::Create( ,sizeof(LONG) ,(PVOID)&lColor ); - vColour.Set(wxString("NAVY")); + vColour = wxSystemSettingsNative::GetColour(wxSYS_COLOUR_HIGHLIGHT); lColor = (LONG)vColour.GetPixel(); ::WinSetPresParam( m_hWnd ,PP_HILITEBACKGROUNDCOLOR @@ -215,6 +212,8 @@ bool wxListBox::Create( ,(PVOID)&lColor ); + SetXComp(0); + SetYComp(0); SetSize( nX ,nY ,nWidth @@ -227,7 +226,7 @@ bool wxListBox::Create( wxListBox::~wxListBox() { #if wxUSE_OWNER_DRAWN - size_t lUiCount = m_aItems.Count(); + size_t lUiCount = m_aItems.Count(); while (lUiCount-- != 0) { @@ -246,154 +245,85 @@ void wxListBox::SetupColours() // implementation of wxListBoxBase methods // ---------------------------------------------------------------------------- -void wxListBox::DoSetFirstItem( - int N -) +void wxListBox::DoSetFirstItem(int N) { - wxCHECK_RET( N >= 0 && N < m_nNumItems, + wxCHECK_RET( IsValid(N), wxT("invalid index in wxListBox::SetFirstItem") ); ::WinSendMsg(GetHwnd(), LM_SETTOPINDEX, MPFROMLONG(N), (MPARAM)0); } // end of wxListBox::DoSetFirstItem -void wxListBox::Delete( - int N -) +void wxListBox::DoDeleteOneItem(unsigned int n) { - wxCHECK_RET( N >= 0 && N < m_nNumItems, + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::Delete") ); #if wxUSE_OWNER_DRAWN - delete m_aItems[N]; - m_aItems.RemoveAt(N); -#else // !wxUSE_OWNER_DRAWN - if (HasClientObjectData()) - { - delete GetClientObject(N); - } + delete m_aItems[n]; + m_aItems.RemoveAt(n); #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN - ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)N, (MPARAM)0); + ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, (MPARAM)0); m_nNumItems--; } // end of wxListBox::DoSetFirstItem -int wxListBox::DoAppend( - const wxString& rsItem -) +int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items, + unsigned int pos, + void **clientData, + wxClientDataType type) { - long lIndex = 0; - LONG lIndexType = 0; + long lIndex = 0; + LONG lIndexType = 0; + bool incrementPos = false; - if (m_windowStyle & wxLB_SORT) + if (IsSorted()) lIndexType = LIT_SORTASCENDING; - else + else if (pos == GetCount()) lIndexType = LIT_END; - lIndex = (long)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)rsItem.c_str()); - m_nNumItems++; - -#if wxUSE_OWNER_DRAWN - if (m_windowStyle & wxLB_OWNERDRAW) + else { - wxOwnerDrawn* pNewItem = CreateItem(lIndex); // dummy argument - wxScreenDC vDc; - - - pNewItem->SetName(rsItem); - m_aItems.Insert(pNewItem, lIndex); - ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)lIndex, MPFROMP(pNewItem)); - pNewItem->SetFont(GetFont()); + lIndexType = (LONG)pos; + incrementPos = true; } -#endif - return (int)lIndex; -} // end of wxListBox::DoAppend -void wxListBox::DoSetItems( - const wxArrayString& raChoices -, void** ppClientData -) -{ - BOOL bHideAndShow = IsShown(); - int i; - LONG lIndexType = 0; + int n = wxNOT_FOUND; - if (bHideAndShow) - { - ::WinShowWindow(GetHwnd(), FALSE); - } - ::WinSendMsg(GetHwnd(), LM_DELETEALL, (MPARAM)0, (MPARAM)0); - m_nNumItems = raChoices.GetCount(); - for (i = 0; i < m_nNumItems; i++) + unsigned int count = items.GetCount(); + for (unsigned int i = 0; i < count; i++) { - - if (m_windowStyle & wxLB_SORT) - lIndexType = LIT_SORTASCENDING; - else - lIndexType = LIT_END; - ::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)raChoices[i].c_str()); - - if (ppClientData) + n = (int)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)items[i].wx_str()); + if (n < 0) { -#if wxUSE_OWNER_DRAWN - wxASSERT_MSG(ppClientData[i] == NULL, - wxT("Can't use client data with owner-drawn listboxes")); -#else // !wxUSE_OWNER_DRAWN - ::WinSendMsg(WinUtil_GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(lCount), MPFROMP(ppClientData[i])); -#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN + wxLogLastError(_T("WinSendMsg(LM_INSERTITEM)")); + n = wxNOT_FOUND; + break; } - } + ++m_nNumItems; #if wxUSE_OWNER_DRAWN - if ( m_windowStyle & wxLB_OWNERDRAW ) - { - // - // First delete old items - // - WX_CLEAR_ARRAY(m_aItems); - - // - // Then create new ones - // - for (size_t ui = 0; ui < (size_t)m_nNumItems; ui++) + if (HasFlag(wxLB_OWNERDRAW)) { - wxOwnerDrawn* pNewItem = CreateItem(ui); - - pNewItem->SetName(raChoices[ui]); - m_aItems.Add(pNewItem); - ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(ui), MPFROMP(pNewItem)); + wxOwnerDrawn* pNewItem = CreateItem(n); // dummy argument + wxScreenDC vDc; // FIXME: is it really needed here? + + pNewItem->SetName(items[i]); + m_aItems.Insert(pNewItem, n); + pNewItem->SetFont(GetFont()); } - } -#endif // wxUSE_OWNER_DRAWN - ::WinShowWindow(GetHwnd(), TRUE); -} // end of wxListBox::DoSetItems - -int wxListBox::FindString( - const wxString& rsString -) const -{ - int nPos; - LONG lTextLength; - PSZ zStr; - +#endif + AssignNewItemClientData(n, clientData, i, type); - for (nPos = 0; nPos < m_nNumItems; nPos++) - { - lTextLength = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)nPos, (MPARAM)0)); - zStr = new char[lTextLength + 1]; - ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT(nPos, (SHORT)lTextLength), (MPARAM)zStr); - if (rsString == (char*)zStr) - { - delete [] zStr; - break; - } - delete [] zStr; + if (incrementPos) + ++lIndexType; } - return nPos; -} // end of wxListBox::FindString -void wxListBox::Clear() + return n; +} // end of wxListBox::DoInsertAppendItemsWithData + +void wxListBox::DoClear() { #if wxUSE_OWNER_DRAWN - size_t lUiCount = m_aItems.Count(); + unsigned int lUiCount = m_aItems.Count(); while (lUiCount-- != 0) { @@ -401,26 +331,15 @@ void wxListBox::Clear() } m_aItems.Clear(); -#else // !wxUSE_OWNER_DRAWN - if (HasClientObjectData()) - { - for (size_t n = 0; n < (size_t)m_lNumItems; n++) - { - delete GetClientObject(n); - } - } -#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN +#endif // wxUSE_OWNER_DRAWN ::WinSendMsg(GetHwnd(), LM_DELETEALL, (MPARAM)0, (MPARAM)0); m_nNumItems = 0; } // end of wxListBox::Clear -void wxListBox::DoSetSelection( - int N -, bool bSelect -) +void wxListBox::DoSetSelection( int N, bool bSelect) { - wxCHECK_RET( N >= 0 && N < m_nNumItems, + wxCHECK_RET( IsValid(N), wxT("invalid index in wxListBox::SetSelection") ); ::WinSendMsg( GetHwnd() ,LM_SELECTITEM @@ -431,11 +350,9 @@ void wxListBox::DoSetSelection( Refresh(); } // end of wxListBox::SetSelection -bool wxListBox::IsSelected( - int N -) const +bool wxListBox::IsSelected( int N ) const { - wxCHECK_MSG( N >= 0 && N < m_nNumItems, false, + wxCHECK_MSG( IsValid(N), false, wxT("invalid index in wxListBox::Selected") ); LONG lItem; @@ -454,52 +371,19 @@ bool wxListBox::IsSelected( return (lItem == (LONG)N && lItem != LIT_NONE); } // end of wxListBox::IsSelected -wxClientData* wxListBox::DoGetItemClientObject( - int n -) const -{ - return (wxClientData *)DoGetItemClientData(n); -} - -void* wxListBox::DoGetItemClientData( - int n -) const +void* wxListBox::DoGetItemClientData(unsigned int n) const { - wxCHECK_MSG( n >= 0 && n < m_nNumItems, NULL, + wxCHECK_MSG( IsValid(n), NULL, wxT("invalid index in wxListBox::GetClientData") ); return((void *)::WinSendMsg(GetHwnd(), LM_QUERYITEMHANDLE, MPFROMLONG(n), (MPARAM)0)); } // end of wxListBox::DoGetItemClientData -void wxListBox::DoSetItemClientObject( - int n -, wxClientData* pClientData -) -{ - DoSetItemClientData( n - ,pClientData - ); -} // end of wxListBox::DoSetItemClientObject - -void wxListBox::DoSetItemClientData( - int n -, void* pClientData -) +void wxListBox::DoSetItemClientData(unsigned int n, void* pClientData) { - wxCHECK_RET( n >= 0 && n < m_nNumItems, + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetClientData") ); -#if wxUSE_OWNER_DRAWN - if ( m_windowStyle & wxLB_OWNERDRAW ) - { - // - // Client data must be pointer to wxOwnerDrawn, otherwise we would crash - // in OnMeasure/OnDraw. - // - wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes")); - } -#endif // wxUSE_OWNER_DRAWN - ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(n), MPFROMP(pClientData)); } // end of wxListBox::DoSetItemClientData @@ -508,12 +392,10 @@ bool wxListBox::HasMultipleSelection() const return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED); } // end of wxListBox::HasMultipleSelection -int wxListBox::GetSelections( - wxArrayInt& raSelections -) const +int wxListBox::GetSelections( wxArrayInt& raSelections ) const { - int nCount = 0; - LONG lItem; + int nCount = 0; + LONG lItem; raSelections.Empty(); @@ -557,7 +439,6 @@ int wxListBox::GetSelections( } return nCount; } - return 0; } else // single-selection listbox { @@ -588,126 +469,85 @@ int wxListBox::GetSelection() const )); } // end of wxListBox::GetSelection -wxString wxListBox::GetString( - int N -) const +wxString wxListBox::GetString(unsigned int n) const { - LONG lLen = 0; - char* zBuf; - wxString sResult; + LONG lLen = 0; + wxChar* zBuf; + wxString sResult; - wxCHECK_MSG( N >= 0 && N < m_nNumItems, "", + wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("invalid index in wxListBox::GetClientData") ); - lLen = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)N, (MPARAM)0)); - zBuf = new char[lLen + 1]; - ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)N, (SHORT)lLen), (MPARAM)zBuf); + lLen = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0)); + zBuf = new wxChar[lLen + 1]; + ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)n, (SHORT)lLen), (MPARAM)zBuf); zBuf[lLen] = '\0'; sResult = zBuf; delete [] zBuf; return sResult; } // end of wxListBox::GetString -void wxListBox::DoInsertItems( - const wxArrayString& asItems -, int nPos -) -{ - wxCHECK_RET( nPos >= 0 && nPos <= m_nNumItems, - wxT("invalid index in wxListBox::InsertItems") ); - - int nItems = asItems.GetCount(); - - for (int i = 0; i < nItems; i++) - { - int nIndex = (int)::WinSendMsg( GetHwnd() - ,LM_INSERTITEM - ,MPFROMLONG((LONG)(i + nPos)) - ,(MPARAM)asItems[i].c_str() - ); - - wxOwnerDrawn* pNewItem = CreateItem(nIndex); - - pNewItem->SetName(asItems[i]); - pNewItem->SetFont(GetFont()); - m_aItems.Insert(pNewItem, nIndex); - ::WinSendMsg( GetHwnd() - ,LM_SETITEMHANDLE - ,(MPARAM)((LONG)nIndex) - ,MPFROMP(pNewItem) - ); - m_nNumItems += nItems; - } -} // end of wxListBox::DoInsertItems - -void wxListBox::SetString( - int N -, const wxString& rsString -) +void wxListBox::SetString(unsigned int n, const wxString& rsString) { - wxCHECK_RET( N >= 0 && N < m_nNumItems, + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") ); // // Remember the state of the item // - bool bWasSelected = IsSelected(N); - void* pOldData = NULL; - wxClientData* pOldObjData = NULL; + bool bWasSelected = IsSelected(n); + void* pOldData = NULL; + wxClientData* pOldObjData = NULL; - if (m_clientDataItemsType == wxClientData_Void) - pOldData = GetClientData(N); - else if (m_clientDataItemsType == wxClientData_Object) - pOldObjData = GetClientObject(N); + if ( HasClientUntypedData() ) + pOldData = GetClientData(n); + else if ( HasClientObjectData() ) + pOldObjData = GetClientObject(n); // // Delete and recreate it // ::WinSendMsg( GetHwnd() ,LM_DELETEITEM - ,(MPARAM)N + ,(MPARAM)n ,(MPARAM)0 ); - int nNewN = N; + int nNewN = n; - if (N == m_nNumItems - 1) + if (n == (m_nNumItems - 1)) nNewN = -1; ::WinSendMsg( GetHwnd() ,LM_INSERTITEM ,(MPARAM)nNewN - ,(MPARAM)rsString.c_str() + ,(MPARAM)rsString.wx_str() ); // // Restore the client data // if (pOldData) - SetClientData( N - ,pOldData - ); + SetClientData(n, pOldData); else if (pOldObjData) - SetClientObject( N - ,pOldObjData - ); + SetClientObject(n, pOldObjData); // // We may have lost the selection // if (bWasSelected) - Select(N); + Select(n); #if wxUSE_OWNER_DRAWN if (m_windowStyle & wxLB_OWNERDRAW) // // Update item's text // - m_aItems[N]->SetName(rsString); + m_aItems[n]->SetName(rsString); #endif //USE_OWNER_DRAWN } // end of wxListBox::SetString -int wxListBox::GetCount() const +unsigned int wxListBox::GetCount() const { return m_nNumItems; } @@ -721,20 +561,17 @@ wxSize wxListBox::DoGetBestSize() const // // Find the widest string // - int nLine; - int nListbox = 0; - int nCx; - int nCy; - wxFont vFont = (wxFont)GetFont(); + int nLine; + int nListbox = 0; + int nCx; + int nCy; + wxFont vFont = (wxFont)GetFont(); - for (int i = 0; i < m_nNumItems; i++) + for (unsigned int i = 0; i < m_nNumItems; i++) { - wxString vStr(GetString(i)); + wxString vStr(GetString(i)); - GetTextExtent( vStr - ,&nLine - ,NULL - ); + GetTextExtent( vStr, &nLine, NULL ); if (nLine > nListbox) nListbox = nLine; } @@ -756,7 +593,7 @@ wxSize wxListBox::DoGetBestSize() const ); nListbox += 3 * nCx; - int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * (wxMax(m_nNumItems, 7)); + int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * (wxMax(m_nNumItems, 7)); return wxSize( nListbox ,hListbox @@ -777,7 +614,7 @@ bool wxListBox::OS2Command( { eEvtType = wxEVT_COMMAND_LISTBOX_SELECTED; } - if (uParam == LN_ENTER) + else if (uParam == LN_ENTER) { eEvtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED; } @@ -794,9 +631,9 @@ bool wxListBox::OS2Command( vEvent.SetEventObject(this); - wxArrayInt aSelections; - int n; - int nCount = GetSelections(aSelections); + wxArrayInt aSelections; + int n; + int nCount = GetSelections(aSelections); if (nCount > 0) { @@ -812,7 +649,7 @@ bool wxListBox::OS2Command( n = -1; } vEvent.SetInt(n); - return GetEventHandler()->ProcessEvent(vEvent); + return HandleWindowEvent(vEvent); } // end of wxListBox::OS2Command // ---------------------------------------------------------------------------- @@ -827,9 +664,7 @@ bool wxListBox::OS2Command( // #define OWNER_DRAWN_LISTBOX_EXTRA_SPACE (1) -long wxListBox::OS2OnMeasure( - WXMEASUREITEMSTRUCT* pItem -) +long wxListBox::OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem) { if (!pItem) pItem = (WXMEASUREITEMSTRUCT*)new OWNERITEM; @@ -867,7 +702,6 @@ bool wxListBox::OS2OnDraw ( ) { POWNERITEM pDrawStruct = (POWNERITEM)pItem; - LONG lItemID = pDrawStruct->idItem; int eAction = 0; int eStatus = 0; @@ -880,28 +714,18 @@ bool wxListBox::OS2OnDraw ( // // The item may be -1 for an empty listbox // - if (lItemID == -1L) + if (pDrawStruct->idItem == -1L) return false; - wxListBoxItem* pData = (wxListBoxItem*)PVOIDFROMMR( ::WinSendMsg( GetHwnd() - ,LM_QUERYITEMHANDLE - ,MPFROMLONG(pDrawStruct->idItem) - ,(MPARAM)0 - ) - ); - - wxCHECK(pData, false ); + wxListBoxItem* pData = (wxListBoxItem*)m_aItems[pDrawStruct->idItem]; - wxDC vDc; - wxRect vRect( wxPoint( pDrawStruct->rclItem.xLeft - ,pDrawStruct->rclItem.yTop - ) - ,wxPoint( pDrawStruct->rclItem.xRight - ,pDrawStruct->rclItem.yBottom - ) - ); + wxClientDC vDc(this); + wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl(); + wxPoint pt1( pDrawStruct->rclItem.xLeft, pDrawStruct->rclItem.yTop ); + wxPoint pt2( pDrawStruct->rclItem.xRight, pDrawStruct->rclItem.yBottom ); + wxRect vRect( pt1, pt2 ); - vDc.SetHPS(pDrawStruct->hps); + impl->SetHPS(pDrawStruct->hps); if (pDrawStruct->fsAttribute == pDrawStruct->fsAttributeOld) { @@ -975,5 +799,4 @@ bool wxListBox::OS2OnDraw ( #endif // ndef for wxUSE_OWNER_DRAWN -#endif // ndef for wxUSE_LISTBOX - +#endif // wxUSE_LISTBOX