X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b23198ab9ef1950e619a219247f124d429001cb4..18c98e42eeb75317f75c9ba20b09a5bd531a690c:/src/msw/listbox.cpp?ds=sidebyside diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 869a9116b5..4eb467f503 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -29,6 +29,7 @@ #include "wx/brush.h" #include "wx/font.h" #include "wx/dc.h" +#include "wx/utils.h" #endif #include @@ -48,7 +49,9 @@ #ifndef __TWIN32__ #if defined(__GNUWIN32__) - #include + #ifndef wxUSE_NORLANDER_HEADERS + #include + #endif #endif #endif @@ -112,51 +115,11 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n) // list box control implementation // ============================================================================ -bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) -{ - /* - if (param == LBN_SELCANCEL) - { - event.extraLong = FALSE; - } - */ - if (param == LBN_SELCHANGE) - { - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId); - wxArrayInt aSelections; - int count = GetSelections(aSelections); - if ( count > 0 ) - { - event.m_commandInt = aSelections[0] ; - event.m_clientData = GetClientData(event.m_commandInt); - wxString str(GetString(event.m_commandInt)); - if (str != "") - { - event.m_commandString = str; - } - } - else - { - event.m_commandInt = -1 ; - event.m_commandString.Empty(); - } +// ---------------------------------------------------------------------------- +// creation +// ---------------------------------------------------------------------------- - event.SetEventObject( this ); - ProcessCommand(event); - return TRUE; - } - else if (param == LBN_DBLCLK) - { - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event) ; - return TRUE; - } - - return FALSE; -} - - // Listbox item +// Listbox item wxListBox::wxListBox() { m_noItems = 0; @@ -202,7 +165,7 @@ bool wxListBox::Create(wxWindow *parent, wstyle |= LBS_EXTENDEDSEL; if (m_windowStyle & wxLB_ALWAYS_SB) - wstyle |= LBS_DISABLENOSCROLL ; + wstyle |= LBS_DISABLENOSCROLL; if (m_windowStyle & wxLB_HSCROLL) wstyle |= WS_HSCROLL; if (m_windowStyle & wxLB_SORT) @@ -220,22 +183,22 @@ bool wxListBox::Create(wxWindow *parent, wstyle |= LBS_NOINTEGRALHEIGHT; bool want3D; - WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ; + WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D); - // Even with extended styles, need to combine with WS_BORDER - // for them to look right. + // Even with extended styles, need to combine with WS_BORDER for them to + // look right. if ( want3D || wxStyleHasBorder(m_windowStyle) ) { wstyle |= WS_BORDER; } - m_hWnd = (WXHWND)::CreateWindowEx(exStyle, "LISTBOX", NULL, + m_hWnd = (WXHWND)::CreateWindowEx(exStyle, wxT("LISTBOX"), NULL, wstyle | WS_CHILD, 0, 0, 0, 0, (HWND)parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL); - wxCHECK_MSG( m_hWnd, FALSE, "Failed to create listbox" ); + wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create listbox") ); #if wxUSE_CTL3D if (want3D) @@ -281,26 +244,32 @@ void wxListBox::SetupColours() SetForegroundColour(GetParent()->GetForegroundColour()); } -void wxListBox::SetFirstItem(int N) -{ - wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::SetFirstItem" ); - - SendMessage(GetHwnd(),LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ; -} +// ---------------------------------------------------------------------------- +// implementation of wxListBoxBase methods +// ---------------------------------------------------------------------------- -void wxListBox::SetFirstItem(const wxString& s) +void wxListBox::DoSetFirstItem(int N) { - int N = FindString(s) ; + wxCHECK_RET( N >= 0 && N < m_noItems, + wxT("invalid index in wxListBox::SetFirstItem") ); - if ( N >= 0 ) - SetFirstItem(N) ; + SendMessage(GetHwnd(), LB_SETTOPINDEX, (WPARAM)N, (LPARAM)0); } void wxListBox::Delete(int N) { wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::Delete" ); + wxT("invalid index in wxListBox::Delete") ); + +#if wxUSE_OWNER_DRAWN + delete m_aItems[N]; + m_aItems.Remove(N); +#else // !wxUSE_OWNER_DRAWN + if ( HasClientObjectData() ) + { + delete GetClientObject(N); + } +#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN SendMessage(GetHwnd(), LB_DELETESTRING, N, 0); m_noItems--; @@ -308,10 +277,10 @@ void wxListBox::Delete(int N) SetHorizontalExtent(""); } -void wxListBox::Append(const wxString& item) +int wxListBox::DoAppend(const wxString& item) { int index = ListBox_AddString(GetHwnd(), item); - m_noItems ++; + m_noItems++; #if wxUSE_OWNER_DRAWN if ( m_windowStyle & wxLB_OWNERDRAW ) { @@ -323,39 +292,31 @@ void wxListBox::Append(const wxString& item) #endif SetHorizontalExtent(item); -} -void wxListBox::Append(const wxString& item, void *Client_data) -{ - int index = ListBox_AddString(GetHwnd(), item); - m_noItems ++; - -#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("Can't use client data with owner-drawn listboxes"); - } - else -#endif - - ListBox_SetItemData(GetHwnd(), index, Client_data); - - SetHorizontalExtent(item); + return index; } -void wxListBox::Set(int n, const wxString *choices, void** clientData) +void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) { ShowWindow(GetHwnd(), SW_HIDE); + ListBox_ResetContent(GetHwnd()); + + m_noItems = choices.GetCount(); int i; - for (i = 0; i < n; i++) + for (i = 0; i < m_noItems; i++) { ListBox_AddString(GetHwnd(), choices[i]); if ( clientData ) + { +#if wxUSE_OWNER_DRAWN + wxASSERT_MSG(clientData[i] == NULL, + wxT("Can't use client data with owner-drawn listboxes")); +#else // !wxUSE_OWNER_DRAWN ListBox_SetItemData(GetHwnd(), i, clientData[i]); +#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN + } } - m_noItems = n; #if wxUSE_OWNER_DRAWN if ( m_windowStyle & wxLB_OWNERDRAW ) { @@ -367,19 +328,17 @@ void wxListBox::Set(int n, const wxString *choices, void** clientData) m_aItems.Empty(); // then create new ones - for (ui = 0; ui < (size_t)n; ui++) { + for ( ui = 0; ui < (size_t)m_noItems; ui++ ) { wxOwnerDrawn *pNewItem = CreateItem(ui); pNewItem->SetName(choices[ui]); m_aItems.Add(pNewItem); ListBox_SetItemData(GetHwnd(), ui, pNewItem); - - wxASSERT_MSG(clientData[ui] == NULL, - "Can't use client data with owner-drawn listboxes"); } } -#endif +#endif // wxUSE_OWNER_DRAWN + + SetHorizontalExtent(); - SetHorizontalExtent(""); ShowWindow(GetHwnd(), SW_SHOW); } @@ -387,15 +346,13 @@ int wxListBox::FindString(const wxString& s) const { int pos = ListBox_FindStringExact(GetHwnd(), (WPARAM)-1, s); if (pos == LB_ERR) - return -1; + return wxNOT_FOUND; else return pos; } void wxListBox::Clear() { - ListBox_ResetContent(GetHwnd()); - #if wxUSE_OWNER_DRAWN size_t uiCount = m_aItems.Count(); while ( uiCount-- != 0 ) { @@ -403,60 +360,84 @@ void wxListBox::Clear() } m_aItems.Clear(); -#endif // wxUSE_OWNER_DRAWN +#else // !wxUSE_OWNER_DRAWN + if ( HasClientObjectData() ) + { + for ( size_t n = 0; n < (size_t)m_noItems; n++ ) + { + delete GetClientObject(n); + } + } +#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN + + ListBox_ResetContent(GetHwnd()); m_noItems = 0; - ListBox_GetHorizontalExtent(GetHwnd()); + SetHorizontalExtent(); } void wxListBox::SetSelection(int N, bool select) { wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::SetSelection" ); + wxT("invalid index in wxListBox::SetSelection") ); - if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED)) + if ( HasMultipleSelection() ) + { SendMessage(GetHwnd(), LB_SETSEL, select, N); + } else { - int N1 = N; - if (!select) - N1 = -1; - SendMessage(GetHwnd(), LB_SETCURSEL, N1, 0); + SendMessage(GetHwnd(), LB_SETCURSEL, select ? N : -1, 0); } } -bool wxListBox::Selected(int N) const +bool wxListBox::IsSelected(int N) const { wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE, - "invalid index in wxListBox::Selected" ); + wxT("invalid index in wxListBox::Selected") ); return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? FALSE : TRUE; } -void wxListBox::Deselect(int N) +wxClientData* wxListBox::DoGetItemClientObject(int n) const { - wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::Deselect" ); - - if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED)) - SendMessage(GetHwnd(), LB_SETSEL, FALSE, N); + return (wxClientData *)DoGetItemClientData(n); } -void *wxListBox::GetClientData(int N) const +void *wxListBox::DoGetItemClientData(int n) const { - wxCHECK_MSG( N >= 0 && N < m_noItems, NULL, - "invalid index in wxListBox::GetClientData" ); + wxCHECK_MSG( n >= 0 && n < m_noItems, NULL, + wxT("invalid index in wxListBox::GetClientData") ); - return (char *)SendMessage(GetHwnd(), LB_GETITEMDATA, N, 0); + return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0); } -void wxListBox::SetClientData(int N, void *Client_data) +void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData) { - wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::SetClientData" ); + DoSetItemClientData(n, clientData); +} + +void wxListBox::DoSetItemClientData(int n, void *clientData) +{ + wxCHECK_RET( n >= 0 && n < m_noItems, + 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 + + if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR ) + wxLogDebug(wxT("LB_SETITEMDATA failed")); +} - if ( ListBox_SetItemData(GetHwnd(), N, Client_data) == LB_ERR ) - wxLogDebug("LB_SETITEMDATA failed"); +bool wxListBox::HasMultipleSelection() const +{ + return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED); } // Return number of selections and an array of selected integers @@ -464,14 +445,14 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const { aSelections.Empty(); - if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED)) + if ( HasMultipleSelection() ) { int no_sel = ListBox_GetSelCount(GetHwnd()); if (no_sel != 0) { int *selections = new int[no_sel]; - if ( ListBox_GetSelItems(GetHwnd(), no_sel, selections) == LB_ERR ) { - wxFAIL_MSG("This listbox can't have single-selection style!"); - } + int rc = ListBox_GetSelItems(GetHwnd(), no_sel, selections); + + wxCHECK_MSG(rc != LB_ERR, -1, wxT("ListBox_GetSelItems failed")); aSelections.Alloc(no_sel); for ( int n = 0; n < no_sel; n++ ) @@ -493,11 +474,10 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const // Get single selection, for single choice list items int wxListBox::GetSelection() const { - wxCHECK_MSG( !(m_windowStyle & wxLB_MULTIPLE) && - !(m_windowStyle & wxLB_EXTENDED), + wxCHECK_MSG( !HasMultipleSelection(), -1, - "GetSelection() can't be used with multiple-selection " - "listboxes, use GetSelections() instead." ); + wxT("GetSelection() can't be used with multiple-selection " + "listboxes, use GetSelections() instead.") ); return ListBox_GetCurSel(GetHwnd()); } @@ -506,7 +486,7 @@ int wxListBox::GetSelection() const wxString wxListBox::GetString(int N) const { wxCHECK_MSG( N >= 0 && N < m_noItems, "", - "invalid index in wxListBox::GetClientData" ); + wxT("invalid index in wxListBox::GetClientData") ); int len = ListBox_GetTextLen(GetHwnd(), N); @@ -518,65 +498,72 @@ wxString wxListBox::GetString(int N) const return result; } -void wxListBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) +void +wxListBox::DoInsertItems(const wxArrayString& items, int pos) { - int currentX, currentY; - GetPosition(¤tX, ¤tY); - - int x1 = x; - int y1 = y; - int w1 = width; - int h1 = height; - - if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - x1 = currentX; - if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - y1 = currentY; + wxCHECK_RET( pos >= 0 && pos <= m_noItems, + wxT("invalid index in wxListBox::InsertItems") ); - AdjustForParentClientOrigin(x1, y1, sizeFlags); + int nItems = items.GetCount(); + for ( int i = 0; i < nItems; i++ ) + ListBox_InsertString(GetHwnd(), i + pos, items[i]); + m_noItems += nItems; - // If we're prepared to use the existing size, then... - if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)) - { - GetSize(&w1, &h1); - } + SetHorizontalExtent(); +} - int cx; // button font dimensions - int cy; +void wxListBox::SetString(int N, const wxString& s) +{ + wxCHECK_RET( N >= 0 && N < m_noItems, + wxT("invalid index in wxListBox::SetString") ); - wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont()); + // remember the state of the item + bool wasSelected = IsSelected(N); - float control_width, control_height, control_x, control_y; + void *oldData = NULL; + wxClientData *oldObjData = NULL; + if ( m_clientDataItemsType == ClientData_Void ) + oldData = GetClientData(N); + else if ( m_clientDataItemsType == ClientData_Object ) + oldObjData = GetClientObject(N); - // Deal with default size (using -1 values) - if (w1<=0) - w1 = DEFAULT_ITEM_WIDTH; + // delete and recreate it + SendMessage(GetHwnd(), LB_DELETESTRING, N, 0); - if (h1<=0) - h1 = DEFAULT_ITEM_HEIGHT; + int newN = N; + if ( N == m_noItems - 1 ) + newN = -1; - control_x = (float)x1; - control_y = (float)y1; - control_width = (float)w1; - control_height = (float)h1; + ListBox_InsertString(GetHwnd(), newN, s); - // Calculations may have made size too small - if (control_height <= 0) - control_height = (float)DEFAULT_ITEM_HEIGHT; + // restore the client data + if ( oldData ) + SetClientData(N, oldData); + else if ( oldObjData ) + SetClientObject(N, oldObjData); - if (control_width <= 0) - control_width = (float)DEFAULT_ITEM_WIDTH; + // we may have lost the selection + if ( wasSelected ) + Select(N); - MoveWindow(GetHwnd(), - (int)control_x, (int)control_y, - (int)control_width, (int)control_height, - TRUE); +#if wxUSE_OWNER_DRAWN + if ( m_windowStyle & wxLB_OWNERDRAW ) + // update item's text + m_aItems[N]->SetName(s); +#endif //USE_OWNER_DRAWN +} +int wxListBox::GetCount() const +{ + return m_noItems; } -// Windows-specific code to set the horizontal extent of -// the listbox, if necessary. If s is non-NULL, it's -// used to calculate the horizontal extent. +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- + +// Windows-specific code to set the horizontal extent of the listbox, if +// necessary. If s is non-NULL, it's used to calculate the horizontal extent. // Otherwise, all strings are used. void wxListBox::SetHorizontalExtent(const wxString& s) { @@ -585,7 +572,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s) return; TEXTMETRIC lpTextMetric; - if (s != "") + if ( !s.IsEmpty() ) { int existingExtent = (int)SendMessage(GetHwnd(), LB_GETHORIZONTALEXTENT, 0, 0L); HDC dc = GetWindowDC(GetHwnd()); @@ -595,7 +582,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s) GetTextMetrics(dc, &lpTextMetric); SIZE extentXY; - ::GetTextExtentPoint(dc, (LPSTR) (const char *)s, s.Length(), &extentXY); + ::GetTextExtentPoint(dc, (LPTSTR) (const wxChar *)s, s.Length(), &extentXY); int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth); if (oldFont) @@ -604,7 +591,6 @@ void wxListBox::SetHorizontalExtent(const wxString& s) ReleaseDC(GetHwnd(), dc); if (extentX > existingExtent) SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(extentX), 0L); - return; } else { @@ -621,7 +607,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s) int len = (int)SendMessage(GetHwnd(), LB_GETTEXT, i, (LONG)wxBuffer); wxBuffer[len] = 0; SIZE extentXY; - ::GetTextExtentPoint(dc, (LPSTR)wxBuffer, len, &extentXY); + ::GetTextExtentPoint(dc, (LPTSTR)wxBuffer, len, &extentXY); int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth); if (extentX > largestExtent) largestExtent = extentX; @@ -634,99 +620,85 @@ void wxListBox::SetHorizontalExtent(const wxString& s) } } -void -wxListBox::InsertItems(int nItems, const wxString items[], int pos) +wxSize wxListBox::DoGetBestSize() { - wxCHECK_RET( pos >= 0 && pos <= m_noItems, - "invalid index in wxListBox::InsertItems" ); - - int i; - for (i = 0; i < nItems; i++) - ListBox_InsertString(GetHwnd(), i + pos, items[i]); - m_noItems += nItems; - - SetHorizontalExtent(""); -} - -void wxListBox::SetString(int N, const wxString& s) -{ - wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::SetString" ); - - int sel = -1; - if (!(m_windowStyle & wxLB_MULTIPLE) && !(m_windowStyle & wxLB_EXTENDED)) - sel = GetSelection(); - - void *oldData = wxListBox::GetClientData(N); + // find the widest string + int wLine; + int wListbox = 0; + for ( int i = 0; i < m_noItems; i++ ) + { + wxString str(GetString(i)); + GetTextExtent(str, &wLine, NULL); + if ( wLine > wListbox ) + wListbox = wLine; + } - SendMessage(GetHwnd(), LB_DELETESTRING, N, 0); + // give it some reasonable default value if there are no strings in the + // list + if ( wListbox == 0 ) + wListbox = 100; - int newN = N; - if (N == (m_noItems - 1)) - newN = -1; + // the listbox should be slightly larger than the widest string + int cx, cy; + wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); - SendMessage(GetHwnd(), LB_INSERTSTRING, newN, (LPARAM) (const char *)s); - if (oldData) - wxListBox::SetClientData(N, oldData); + wListbox += 3*cx; - // Selection may have changed - if (sel >= 0) - SetSelection(sel); + int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*(wxMax(m_noItems, 7)); -#if wxUSE_OWNER_DRAWN - if ( m_windowStyle & wxLB_OWNERDRAW ) - // update item's text - m_aItems[N]->SetName(s); -#endif //USE_OWNER_DRAWN + return wxSize(wListbox, hListbox); } -int wxListBox::Number () const -{ - return m_noItems; -} +// ---------------------------------------------------------------------------- +// callbacks +// ---------------------------------------------------------------------------- -// For single selection items only -wxString wxListBox::GetStringSelection () const -{ - int sel = GetSelection (); - if (sel > -1) - return this->GetString (sel); - else - return wxString(""); -} - -bool wxListBox::SetStringSelection (const wxString& s, bool flag) +bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { - int sel = FindString (s); - if (sel > -1) + /* + if (param == LBN_SELCANCEL) + { + event.extraLong = FALSE; + } + */ + if (param == LBN_SELCHANGE) { - SetSelection (sel, flag); + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId); + wxArrayInt aSelections; + int count = GetSelections(aSelections); + if ( count > 0 ) + { + event.m_commandInt = aSelections[0]; + event.m_clientData = GetClientData(event.m_commandInt); + wxString str(GetString(event.m_commandInt)); + if (str != wxT("")) + { + event.m_commandString = str; + } + } + else + { + event.m_commandInt = -1; + event.m_commandString.Empty(); + } + + event.SetEventObject( this ); + ProcessCommand(event); return TRUE; } - else - return FALSE; -} - -// Is this the right thing? Won't setselection generate a command -// event too? No! It'll just generate a setselection event. -// But we still can't have this being called whenever a real command -// is generated, because it sets the selection, which will already -// have been done! (Unless we have an optional argument for calling -// by the actual window system, or a separate function, ProcessCommand) -void wxListBox::Command (wxCommandEvent & event) -{ - if (event.m_extraLong) - SetSelection (event.m_commandInt); - else + else if (param == LBN_DBLCLK) { - Deselect (event.m_commandInt); - return; + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event); + return TRUE; } - ProcessCommand (event); + + return FALSE; } WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) + WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { #if wxUSE_CTL3D if ( m_useCtl3D ) @@ -752,10 +724,9 @@ WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, return (WXHBRUSH) backgroundBrush->GetResourceHandle(); } -long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) -{ - return wxControl::MSWWindowProc(nMsg, wParam, lParam); -} +// ---------------------------------------------------------------------------- +// wxCheckListBox support +// ---------------------------------------------------------------------------- #if wxUSE_OWNER_DRAWN @@ -779,7 +750,7 @@ bool wxListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item; wxDC dc; - dc.SetHDC((WXHDC)CreateIC("DISPLAY", NULL, NULL, 0)); + dc.SetHDC((WXHDC)CreateIC(wxT("DISPLAY"), NULL, NULL, 0)); dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT)); pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;