X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..4d51143c5e77949c4633eae3f083d40f608cf387:/src/os2/choice.cpp diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp index f834ab1fbc..9f0360a9fc 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,84 +12,166 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.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" #endif #include "wx/os2/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) + +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); -bool wxChoice::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - int n, const wxString choices[], - long style, -#if wxUSE_VALIDATORS - const wxValidator& validator, -#endif - const wxString& name) + return Create(pParent, vId, rPos, rSize, chs.GetCount(), chs.GetStrings(), + lStyle, rValidator, rsName); +} + +bool wxChoice::Create( + wxWindow* pParent +, wxWindowID vId +, const wxPoint& rPos +, const wxSize& rSize +, int n +, const wxString asChoices[] +, long lStyle +, const wxValidator& rValidator +, const wxString& rsName +) { - if ( !CreateControl(parent, id, pos, size, style, validator, name) ) - return FALSE; -// TODO: -/* - long msStyle = WS_CHILD | CBS_DROPDOWNLIST | WS_TABSTOP | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL; - if ( style & wxCB_SORT ) - msStyle |= CBS_SORT; - - // the experience shows that wxChoice vs. wxComboBox distinction confuses - // quite a few people - try to help them - wxASSERT_MSG( !(style & wxCB_DROPDOWN) && - !(style & wxCB_READONLY) && - !(style & wxCB_SIMPLE), + long lSstyle; + + if (!CreateControl( pParent + ,vId + ,rPos + ,rSize + ,lStyle + ,rValidator + ,rsName + )) + return false; + lSstyle = CBS_DROPDOWNLIST | + WS_TABSTOP | + WS_VISIBLE; + + // clipping siblings does not yet work + // if (lStyle & wxCLIP_SIBLINGS ) + // lSstyle |= WS_CLIPSIBLINGS; + + wxASSERT_MSG( !(lStyle & wxCB_DROPDOWN) && + !(lStyle & wxCB_READONLY) && + !(lStyle & wxCB_SIMPLE), wxT("this style flag is ignored by wxChoice, you " "probably want to use a wxComboBox") ); - if ( !OS2CreateControl(wxT("COMBOBOX"), msStyle) ) - return FALSE; + if (!OS2CreateControl( wxT("COMBOBOX") + ,lSstyle + )) + return false; - for ( int i = 0; i < n; i++ ) + // + // A choice/combobox normally has a white background (or other, depending + // 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(choices[i]); + Append(asChoices[i]); } -*/ - SetSize(pos.x, pos.y, size.x, size.y); - - return TRUE; + SetSize( rPos.x + ,rPos.y + ,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() +{ + Clear(); } // ---------------------------------------------------------------------------- // adding/deleting items to/from the list // ---------------------------------------------------------------------------- -int wxChoice::DoAppend(const wxString& item) +int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items + , unsigned int pos + , void **clientData + , wxClientDataType type + ) { - // TODO: - /* - int n = (int)SendMessage(GetHwnd(), CB_ADDSTRING, 0, (LONG)item.c_str()); - if ( n == CB_ERR ) + int nIndex = wxNOT_FOUND; + LONG nIndexType = 0; + bool incrementPos = false; + if ( IsSorted() ) + nIndexType = LIT_SORTASCENDING; + else if (pos == GetCount()) + nIndexType = LIT_END; + else { - wxLogLastError("SendMessage(CB_ADDSTRING)"); + nIndexType = pos; + incrementPos = true; } - */ - return 0; //n -} -void wxChoice::Delete(int n) + 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::DoInsertAppendItemsWithData + +void wxChoice::DoDeleteOneItem(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") ); -// TODO: SendMessage(GetHwnd(), CB_DELETESTRING, n, 0); -} + ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, (MPARAM)0); +} // end of wxChoice::Delete -void wxChoice::Clear() +void wxChoice::DoClear() { - // TODO: SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0); -} + ::WinSendMsg(GetHwnd(), LM_DELETEALL, (MPARAM)0, (MPARAM)0); +} // end of wxChoice::Clear // ---------------------------------------------------------------------------- // selection @@ -97,192 +179,207 @@ void wxChoice::Clear() int wxChoice::GetSelection() const { - // TODO: return (int)SendMessage(GetHwnd(), CB_GETCURSEL, 0, 0); - return 0; -} + return((int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0))); +} // end of wxChoice::GetSelection -void wxChoice::SetSelection(int n) +void wxChoice::SetSelection( + int n +) { - // TODO: SendMessage(GetHwnd(), CB_SETCURSEL, n, 0); -} + ::WinSendMsg( GetHwnd() + ,LM_SELECTITEM + ,(MPARAM)n + ,(MPARAM)TRUE + ); +} // end of wxChoice::SetSelection // ---------------------------------------------------------------------------- // string list functions // ---------------------------------------------------------------------------- -int wxChoice::GetCount() const -{ - // TODO: return (int)SendMessage(GetHwnd(), CB_GETCOUNT, 0, 0); - return 0; -} - -int wxChoice::FindString(const wxString& s) const +unsigned int wxChoice::GetCount() const { - // TODO: - /* - int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT, - (WPARAM)-1, (LPARAM)s.c_str()); - - return pos == LB_ERR ? wxNOT_FOUND : pos; - */ - return 0; -} + return((unsigned int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0))); +} // end of wxChoice::GetCount -void wxChoice::SetString(int n, const wxString& s) +void wxChoice::SetString(unsigned int n, const wxString& rsStr) { - wxFAIL_MSG(wxT("not implemented")); - -#if 0 // should do this, but no Insert() so far - Delete(n); - Insert(n + 1, s); -#endif -} + LONG nIndexType = 0; + void* pData; -wxString wxChoice::GetString(int n) const -{ - size_t len = 0; // TODO: (size_t)::SendMessage(GetHwnd(), CB_GETLBTEXTLEN, n, 0); - wxString str = ""; - // TODO: - /* - if (len) { - if ( ::SendMessage(GetHwnd(), CB_GETLBTEXT, n, - (LPARAM)str.GetWriteBuf(len)) == CB_ERR ) { - wxLogLastError("SendMessage(CB_GETLBTEXT)"); - } - str.UngetWriteBuf(); + if ( HasClientData() ) + { + pData = DoGetItemClientData(n); + } + else // no client data + { + pData = NULL; } - */ - return str; -} -// ---------------------------------------------------------------------------- -// client data -// ---------------------------------------------------------------------------- + ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, 0); -void wxChoice::DoSetItemClientData( int n, void* clientData ) -{ - // TODO: - /* - if ( SendMessage(GetHwnd(), CB_SETITEMDATA, n, (LPARAM)clientData) == CB_ERR ) + if (m_windowStyle & wxCB_SORT) + nIndexType = LIT_SORTASCENDING; + else + nIndexType = LIT_END; + ::WinSendMsg( GetHwnd() + ,LM_INSERTITEM + ,(MPARAM)nIndexType + ,(MPARAM)rsStr.wx_str() + ); + + if (pData) { - wxLogLastError(wxT("CB_SETITEMDATA")); + DoSetItemClientData(n, pData); } - */ -} +} // end of wxChoice::SetString -void* wxChoice::DoGetItemClientData( int n ) const +wxString wxChoice::GetString(unsigned int n) const { - // TODO: - /* - LPARAM rc = SendMessage(GetHwnd(), CB_GETITEMDATA, n, 0); - if ( rc == CB_ERR ) - { - wxLogLastError(wxT("CB_GETITEMDATA")); + int nLen = 0; + wxString sStr = wxEmptyString; + wxChar* zBuf; - // unfortunately, there is no way to return an error code to the user - rc = (LPARAM) NULL; + nLen = (size_t)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0)); + if (nLen != LIT_ERROR && nLen > 0) + { + zBuf = new wxChar[++nLen]; + ::WinSendMsg( GetHwnd() + ,LM_QUERYITEMTEXT + ,MPFROM2SHORT((SHORT)n, (SHORT)nLen) + ,(MPARAM)zBuf + ); + sStr = zBuf; + delete [] zBuf; } + return sStr; +} // end of wxChoice::GetString - return (void *)rc; - */ - return NULL; -} +// ---------------------------------------------------------------------------- +// client data +// ---------------------------------------------------------------------------- -void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) +void wxChoice::DoSetItemClientData(unsigned int n, void* pClientData) { - DoSetItemClientData(n, clientData); -} + ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)n, MPFROMP(pClientData)); +} // end of wxChoice::DoSetItemClientData -wxClientData* wxChoice::DoGetItemClientObject( int n ) const +void* wxChoice::DoGetItemClientData(unsigned int n) const { - return (wxClientData *)DoGetItemClientData(n); -} + MRESULT rc = ::WinSendMsg(GetHwnd(), LM_QUERYITEMHANDLE, (MPARAM)n, (MPARAM)0); + return((void*)rc); +} // end of wxChoice::DoGetItemClientData // ---------------------------------------------------------------------------- // wxOS2 specific helpers // ---------------------------------------------------------------------------- -void wxChoice::DoSetSize(int x, int y, - int width, int height, - int sizeFlags) +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(x, y, width, -1, sizeFlags); -} + // + wxControl::DoSetSize( nX + ,nY + ,nWidth + ,wxDefaultCoord + ,nSizeFlags + ); +} // end of wxChoice::DoSetSize wxSize wxChoice::DoGetBestSize() const { - // find the widest string - int wLine; - int wChoice = 0; - int nItems = GetCount(); - for ( int i = 0; i < nItems; i++ ) + // + // Find the widest string + // + int nLineWidth; + int nChoiceWidth = 0; + int nCx; + int nCy; + wxFont vFont = (wxFont)GetFont(); + + const unsigned int nItems = GetCount(); + + for (unsigned int i = 0; i < nItems; i++) { - wxString str(GetString(i)); - GetTextExtent(str, &wLine, NULL); - if ( wLine > wChoice ) - wChoice = wLine; + wxString sStr(GetString(i)); + GetTextExtent( sStr, &nLineWidth, NULL ); + if (nLineWidth > nChoiceWidth) + nChoiceWidth = nLineWidth; } - // give it some reasonable default value if there are no strings in the + // + // Give it some reasonable default value if there are no strings in the // list - if ( wChoice == 0 ) - wChoice = 100; + // + if (nChoiceWidth == 0L) + nChoiceWidth = 100L; - // the combobox should be larger than the widest string - int cx, cy; - wxGetCharSize(GetHWND(), &cx, &cy, (wxFont*)&GetFont()); - - wChoice += 5*cx; + // + // The combobox should be larger than the widest string + // + 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 hChoice = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*nStrings; + int nChoiceHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * nStrings; - return wxSize(wChoice, hChoice); -} + return wxSize(nChoiceWidth, nChoiceHeight); +} // end of wxChoice::DoGetBestSize -MRESULT wxChoice::OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +MRESULT wxChoice::OS2WindowProc( + WXUINT uMsg +, WXWPARAM wParam +, WXLPARAM lParam +) +{ + return wxWindow::OS2WindowProc( uMsg + ,wParam + ,lParam + ); +} // end of wxChoice::OS2WindowProc + +bool wxChoice::OS2Command( + WXUINT uParam +, WXWORD WXUNUSED(wId) +) { - // TODO: - /* - if ( nMsg == WM_LBUTTONUP ) + if (uParam != LN_SELECT) { - int x = (int)LOWORD(lParam); - int y = (int)HIWORD(lParam); - - // Ok, this is truly weird, but if a panel with a wxChoice loses the - // focus, then you get a *fake* WM_LBUTTONUP message with x = 65535 and - // y = 65535. Filter out this nonsense. // - // VZ: I'd like to know how to reproduce this please... - if ( x == 65535 && y == 65535 ) - return 0; + // "selection changed" is the only event we're after + // + return false; } - */ - return wxWindow::OS2WindowProc(hwnd, nMsg, wParam, lParam); -} + int n = GetSelection(); -bool wxChoice::OS2Command(WXUINT param, WXWORD WXUNUSED(id)) -{ - // TODO: - /* - if ( param != CBN_SELCHANGE) + if (n > -1) { - // "selection changed" is the only event we're after - return FALSE; + wxCommandEvent vEvent( wxEVT_COMMAND_CHOICE_SELECTED + ,m_windowId + ); + + vEvent.SetInt(n); + vEvent.SetEventObject(this); + vEvent.SetString(GetStringSelection()); + if (HasClientObjectData()) + vEvent.SetClientObject(GetClientObject(n)); + else if (HasClientUntypedData()) + vEvent.SetClientData(GetClientData(n)); + ProcessCommand(vEvent); } - */ - wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId); - event.SetInt(GetSelection()); - event.SetEventObject(this); -// TODO: event.SetString(GetStringSelection()); - ProcessCommand(event); - - return TRUE; -} + return true; +} // end of wxChoice::OS2Command +#endif // wxUSE_CHOICE