// Purpose: wxListBox
// Author: Julian Smart
// Modified by: Vadim Zeitlin (owner drawn stuff)
-// Created:
+// Created:
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "listbox.h"
+ #pragma implementation "listbox.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
+#include "wx/window.h"
+#include "wx/msw/private.h"
+
#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/utils.h"
#endif
-#include "wx/msw/private.h"
-
-#include <windows.h>
#include <windowsx.h>
-#ifdef __GNUWIN32__
-#include <wx/msw/gnuwin32/extra.h>
+#ifdef __WXWINE__
+ #if defined(GetWindowStyle)
+ #undef GetWindowStyle
+ #endif
#endif
-#ifdef GetCharWidth
-#undef GetCharWidth
-#endif
+#include "wx/dynarray.h"
+#include "wx/log.h"
-#if USE_OWNER_DRAWN
- #include "wx/ownerdrw.h"
+#if wxUSE_OWNER_DRAWN
+ #include "wx/ownerdrw.h"
#endif
-#include "wx/dynarray.h"
-#include "wx/log.h"
+#ifndef __TWIN32__
+ #ifdef __GNUWIN32_OLD__
+ #include "wx/msw/gnuwin32/extra.h"
+ #endif
+#endif
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+#ifdef __WXWINE__
+ #ifndef ListBox_SetItemData
+ #define ListBox_SetItemData(hwndCtl, index, data) \
+ ((int)(DWORD)SendMessage((hwndCtl), LB_SETITEMDATA, (WPARAM)(int)(index), (LPARAM)(data)))
+ #endif
+ #ifndef ListBox_GetHorizontalExtent
+ #define ListBox_GetHorizontalExtent(hwndCtl) \
+ ((int)(DWORD)SendMessage((hwndCtl), LB_GETHORIZONTALEXTENT, 0L, 0L))
+ #endif
+ #ifndef ListBox_GetSelCount
+ #define ListBox_GetSelCount(hwndCtl) \
+ ((int)(DWORD)SendMessage((hwndCtl), LB_GETSELCOUNT, 0L, 0L))
+ #endif
+ #ifndef ListBox_GetSelItems
+ #define ListBox_GetSelItems(hwndCtl, cItems, lpItems) \
+ ((int)(DWORD)SendMessage((hwndCtl), LB_GETSELITEMS, (WPARAM)(int)(cItems), (LPARAM)(int *)(lpItems)))
+ #endif
+ #ifndef ListBox_GetTextLen
+ #define ListBox_GetTextLen(hwndCtl, index) \
+ ((int)(DWORD)SendMessage((hwndCtl), LB_GETTEXTLEN, (WPARAM)(int)(index), 0L))
+ #endif
+ #ifndef ListBox_GetText
+ #define ListBox_GetText(hwndCtl, index, lpszBuffer) \
+ ((int)(DWORD)SendMessage((hwndCtl), LB_GETTEXT, (WPARAM)(int)(index), (LPARAM)(LPCTSTR)(lpszBuffer)))
+ #endif
#endif
+ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+
// ============================================================================
// list box item declaration and implementation
// ============================================================================
-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
class wxListBoxItem : public wxOwnerDrawn
{
public:
- wxListBoxItem(const wxString& str = "");
+ wxListBoxItem(const wxString& str = "");
};
-wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
+wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
{
- // no bitmaps/checkmarks
- SetMarginWidth(0);
+ // no bitmaps/checkmarks
+ SetMarginWidth(0);
}
-wxOwnerDrawn *wxListBox::CreateItem(uint n)
+wxOwnerDrawn *wxListBox::CreateItem(size_t n)
{
- return new wxListBoxItem();
+ return new wxListBoxItem();
}
#endif //USE_OWNER_DRAWN
// list box control implementation
// ============================================================================
-// this macro is dangerous but still better than tons of (HWND)GetHWND()
-#define hwnd (HWND)GetHWND()
-
-bool wxListBox::MSWCommand(const WXUINT param, const 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 = copystring((char *)(const char *)str);
- }
- else
- {
- event.m_commandInt = -1 ;
- event.m_commandString = copystring("") ;
- }
-
- event.SetEventObject( this );
- ProcessCommand(event);
- if (event.m_commandString)
- delete[] event.m_commandString ;
- return TRUE;
- }
- else if (param == LBN_DBLCLK)
- {
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
- event.SetEventObject( this );
- if ( !GetEventHandler()->ProcessEvent(event) )
- {
-#if WXWIN_COMPATIBILITY
- wxWindow *parent = (wxWindow *)GetParent();
- if (parent)
- parent->GetEventHandler()->OnDefaultAction(this);
-#endif
- return TRUE;
- }
- }
- return FALSE;
-}
+// ----------------------------------------------------------------------------
+// creation
+// ----------------------------------------------------------------------------
// Listbox item
-wxListBox::wxListBox(void)
+wxListBox::wxListBox()
{
- m_noItems = 0;
- m_selected = 0;
+ m_noItems = 0;
+ m_selected = 0;
}
-bool wxListBox::Create(wxWindow *parent, const wxWindowID id,
+bool wxListBox::Create(wxWindow *parent,
+ wxWindowID id,
const wxPoint& pos,
const wxSize& size,
- const int n, const wxString choices[],
- const long style,
+ int n, const wxString choices[],
+ long style,
const wxValidator& validator,
const wxString& name)
{
- m_noItems = n;
- m_hWnd = 0;
- m_selected = 0;
-
- SetName(name);
- SetValidator(validator);
-
- if (parent) parent->AddChild(this);
+ m_noItems = 0;
+ m_hWnd = 0;
+ m_selected = 0;
+
+ SetName(name);
+#if wxUSE_VALIDATORS
+ SetValidator(validator);
+#endif // wxUSE_VALIDATORS
+
+ if (parent)
+ parent->AddChild(this);
+
+ wxSystemSettings settings;
+ SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetForegroundColour(parent->GetForegroundColour());
+
+ m_windowId = ( id == -1 ) ? (int)NewControlId() : id;
+
+ int x = pos.x;
+ int y = pos.y;
+ int width = size.x;
+ int height = size.y;
+ m_windowStyle = style;
+
+ DWORD wstyle = WS_VISIBLE | WS_VSCROLL | WS_TABSTOP |
+ LBS_NOTIFY | LBS_HASSTRINGS /* | WS_CLIPSIBLINGS */;
+ if (m_windowStyle & wxLB_MULTIPLE)
+ wstyle |= LBS_MULTIPLESEL;
+ else if (m_windowStyle & wxLB_EXTENDED)
+ wstyle |= LBS_EXTENDEDSEL;
+
+ if (m_windowStyle & wxLB_ALWAYS_SB)
+ wstyle |= LBS_DISABLENOSCROLL;
+ if (m_windowStyle & wxLB_HSCROLL)
+ wstyle |= WS_HSCROLL;
+ if (m_windowStyle & wxLB_SORT)
+ wstyle |= LBS_SORT;
+
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW ) {
+ // we don't support LBS_OWNERDRAWVARIABLE yet
+ wstyle |= LBS_OWNERDRAWFIXED;
+ }
+#endif
- wxSystemSettings settings;
- SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
- SetForegroundColour(parent->GetDefaultForegroundColour());
+ // Without this style, you get unexpected heights, so e.g. constraint layout
+ // doesn't work properly
+ wstyle |= LBS_NOINTEGRALHEIGHT;
- m_windowId = ( id == -1 ) ? (int)NewControlId() : id;
+ bool want3D;
+ WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
- m_windowStyle = style;
+ // Even with extended styles, need to combine with WS_BORDER for them to
+ // look right.
+ if ( want3D || wxStyleHasBorder(m_windowStyle) )
+ {
+ wstyle |= WS_BORDER;
+ }
- DWORD wstyle = WS_VSCROLL | WS_TABSTOP | LBS_NOTIFY | LBS_HASSTRINGS;
- if (m_windowStyle & wxLB_MULTIPLE)
- wstyle |= LBS_MULTIPLESEL;
- else if (m_windowStyle & wxLB_EXTENDED)
- wstyle |= LBS_EXTENDEDSEL;
+ m_hWnd = (WXHWND)::CreateWindowEx(exStyle, wxT("LISTBOX"), NULL,
+ wstyle | WS_CHILD,
+ 0, 0, 0, 0,
+ (HWND)parent->GetHWND(), (HMENU)m_windowId,
+ wxGetInstance(), NULL);
- if (m_windowStyle & wxLB_ALWAYS_SB)
- wstyle |= LBS_DISABLENOSCROLL ;
- if (m_windowStyle & wxLB_HSCROLL)
- wstyle |= WS_HSCROLL;
- if (m_windowStyle & wxLB_SORT)
- wstyle |= LBS_SORT;
+ wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create listbox") );
-#if USE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW ) {
- // we don't support LBS_OWNERDRAWVARIABLE yet
- wstyle |= LBS_OWNERDRAWFIXED;
+#if wxUSE_CTL3D
+ if (want3D)
+ {
+ Ctl3dSubclassCtl(GetHwnd());
+ m_useCtl3D = TRUE;
}
#endif
- // Without this style, you get unexpected heights, so e.g. constraint layout
- // doesn't work properly
- wstyle |= LBS_NOINTEGRALHEIGHT;
-
- bool want3D;
- WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
-
- // Even with extended styles, need to combine with WS_BORDER
- // for them to look right.
- if ( want3D || (m_windowStyle & wxSIMPLE_BORDER)
- || (m_windowStyle & wxRAISED_BORDER)
- || (m_windowStyle & wxSUNKEN_BORDER)
- || (m_windowStyle & wxDOUBLE_BORDER) ) {
- wstyle |= WS_BORDER;
- }
-
- HWND wx_list = CreateWindowEx(exStyle, "LISTBOX", NULL,
- wstyle | WS_CHILD,
- 0, 0, 0, 0,
- (HWND)parent->GetHWND(), (HMENU)m_windowId,
- wxGetInstance(), NULL);
-#if CTL3D
- if (want3D)
- {
- Ctl3dSubclassCtl(wx_list);
- m_useCtl3D = TRUE;
- }
-#endif
- uint ui;
- for (ui = 0; ui < (uint)n; ui++) {
- SendMessage(wx_list, LB_ADDSTRING, 0, (LPARAM)(const char *)choices[ui]);
- }
+ // Subclass again to catch messages
+ SubclassWin(m_hWnd);
- #if USE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW ) {
- for (ui = 0; ui < (uint)n; ui++) {
- // create new item which will process WM_{DRAW|MEASURE}ITEM messages
- wxOwnerDrawn *pNewItem = CreateItem(ui);
- pNewItem->SetName(choices[ui]);
- m_aItems.Add(pNewItem);
- ListBox_SetItemData(wx_list, ui, pNewItem);
- }
+ size_t ui;
+ for (ui = 0; ui < (size_t)n; ui++) {
+ Append(choices[ui]);
}
- #endif
-
- if ((m_windowStyle & wxLB_MULTIPLE) == 0)
- SendMessage(wx_list, LB_SETCURSEL, 0, 0);
-
- ShowWindow(wx_list, SW_SHOW);
- m_hWnd = (WXHWND)wx_list;
+ if ( (m_windowStyle & wxLB_MULTIPLE) == 0 )
+ SendMessage(GetHwnd(), LB_SETCURSEL, 0, 0);
- // Subclass again for purposes of dialog editing mode
- SubclassWin((WXHWND)wx_list);
+ SetFont(parent->GetFont());
- SetFont(* parent->GetFont());
+ SetSize(x, y, width, height);
- SetSize(x, y, width, height);
-
- return TRUE;
+ return TRUE;
}
-wxListBox::~wxListBox(void)
+wxListBox::~wxListBox()
{
- #if USE_OWNER_DRAWN
- uint uiCount = m_aItems.Count();
- while ( uiCount-- != 0 ) {
- delete m_aItems[uiCount];
- }
- #endif
+ Free();
}
-void wxListBox::SetupColours(void)
+void wxListBox::SetupColours()
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
- SetForegroundColour(GetParent()->GetDefaultForegroundColour());
+ SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetForegroundColour(GetParent()->GetForegroundColour());
}
-void wxListBox::SetFirstItem(const int N)
-{
- SendMessage(hwnd,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(const int N)
+void wxListBox::Delete(int N)
{
- SendMessage(hwnd, LB_DELETESTRING, N, 0);
- m_noItems --;
- SetHorizontalExtent("");
+ wxCHECK_RET( N >= 0 && N < m_noItems,
+ wxT("invalid index in wxListBox::Delete") );
+
+ // for owner drawn objects, the data is used for storing wxOwnerDrawn
+ // pointers and we shouldn't touch it
+#if !wxUSE_OWNER_DRAWN
+ if ( !(m_windowStyle & wxLB_OWNERDRAW) )
+#endif // !wxUSE_OWNER_DRAWN
+ if ( HasClientObjectData() )
+ {
+ delete GetClientObject(N);
+ }
+
+ SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);
+ m_noItems--;
+
+ SetHorizontalExtent("");
}
-void wxListBox::Append(const wxString& item)
+int wxListBox::DoAppend(const wxString& item)
{
- int index = ListBox_AddString(hwnd, item);
- m_noItems ++;
+ int index = ListBox_AddString(GetHwnd(), item);
+ m_noItems++;
- #if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
if ( m_windowStyle & wxLB_OWNERDRAW ) {
- wxOwnerDrawn *pNewItem = CreateItem(-1); // dummy argument
- pNewItem->SetName(item);
- m_aItems.Add(pNewItem);
- ListBox_SetItemData(hwnd, index, pNewItem);
+ wxOwnerDrawn *pNewItem = CreateItem(index); // dummy argument
+ pNewItem->SetName(item);
+ m_aItems.Add(pNewItem);
+ ListBox_SetItemData(GetHwnd(), index, pNewItem);
+ pNewItem->SetFont(GetFont());
}
- #endif
+#endif
+
+ SetHorizontalExtent(item);
- SetHorizontalExtent(item);
+ return index;
}
-void wxListBox::Append(const wxString& item, char *Client_data)
+void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
{
- int index = ListBox_AddString(hwnd, item);
- m_noItems ++;
+ // avoid flicker - but don't need to do this for a hidden listbox
+ bool hideAndShow = IsShown();
+ if ( hideAndShow )
+ {
+ ShowWindow(GetHwnd(), SW_HIDE);
+ }
+
+ ListBox_ResetContent(GetHwnd());
- #if USE_OWNER_DRAWN
+ m_noItems = choices.GetCount();
+ int i;
+ for (i = 0; i < m_noItems; i++)
+ {
+ ListBox_AddString(GetHwnd(), choices[i]);
+ if ( clientData )
+ {
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ {
+ wxASSERT_MSG(clientData[i] == NULL,
+ wxT("Can't use client data with owner-drawn listboxes"));
+ }
+ ListBox_SetItemData(GetHwnd(), i, clientData[i]);
+#else // !wxUSE_OWNER_DRAWN
+ ListBox_SetItemData(GetHwnd(), i, clientData[i]);
+#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+ }
+ }
+
+#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");
+ // first delete old items
+ size_t ui = m_aItems.Count();
+ while ( ui-- != 0 ) {
+ delete m_aItems[ui];
+ }
+ m_aItems.Empty();
+
+ // then create new ones
+ 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);
+ }
}
- else
- #endif
- ListBox_SetItemData(hwnd, index, Client_data);
+#endif // wxUSE_OWNER_DRAWN
+
+ SetHorizontalExtent();
- SetHorizontalExtent(item);
+ if ( hideAndShow )
+ {
+ // show the listbox back if we hid it
+ ShowWindow(GetHwnd(), SW_SHOW);
+ }
}
-void wxListBox::Set(const int n, const wxString *choices, char** clientData)
+int wxListBox::FindString(const wxString& s) const
{
- ShowWindow(hwnd, SW_HIDE);
- ListBox_ResetContent(hwnd);
- int i;
- for (i = 0; i < n; i++)
- {
- ListBox_AddString(hwnd, choices[i]);
- if ( clientData )
- ListBox_SetItemData(hwnd, i, clientData[i]);
- }
- m_noItems = n;
+ int pos = ListBox_FindStringExact(GetHwnd(), (WPARAM)-1, s);
+ if (pos == LB_ERR)
+ return wxNOT_FOUND;
+ else
+ return pos;
+}
- #if USE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW ) {
- // first delete old items
- uint ui = m_aItems.Count();
- while ( ui-- != 0 ) {
- delete m_aItems[ui];
- }
- m_aItems.Empty();
-
- // then create new ones
- for (ui = 0; ui < (uint)n; ui++) {
- wxOwnerDrawn *pNewItem = CreateItem(ui);
- pNewItem->SetName(choices[ui]);
- m_aItems.Add(pNewItem);
- ListBox_SetItemData(hwnd, ui, pNewItem);
+void wxListBox::Clear()
+{
+ Free();
- wxASSERT_MSG(clientData[ui] == NULL,
- "Can't use client data with owner-drawn listboxes");
- }
- }
- #endif
+ ListBox_ResetContent(GetHwnd());
- SetHorizontalExtent("");
- ShowWindow(hwnd, SW_SHOW);
+ m_noItems = 0;
+ SetHorizontalExtent();
}
-int wxListBox::FindString(const wxString& s) const
+void wxListBox::Free()
{
- int pos = ListBox_FindStringExact(hwnd, (WPARAM)-1, s);
- if (pos == LB_ERR)
- return -1;
- else
- return pos;
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ {
+ size_t uiCount = m_aItems.Count();
+ while ( uiCount-- != 0 ) {
+ delete m_aItems[uiCount];
+ }
+
+ m_aItems.Clear();
+ }
+ else
+#endif // wxUSE_OWNER_DRAWN
+ if ( HasClientObjectData() )
+ {
+ for ( size_t n = 0; n < (size_t)m_noItems; n++ )
+ {
+ delete GetClientObject(n);
+ }
+ }
+}
+
+void wxListBox::SetSelection(int N, bool select)
+{
+ wxCHECK_RET( N >= 0 && N < m_noItems,
+ wxT("invalid index in wxListBox::SetSelection") );
+
+ if ( HasMultipleSelection() )
+ {
+ SendMessage(GetHwnd(), LB_SETSEL, select, N);
+ }
+ else
+ {
+ SendMessage(GetHwnd(), LB_SETCURSEL, select ? N : -1, 0);
+ }
}
-void wxListBox::Clear(void)
+bool wxListBox::IsSelected(int N) const
{
- ListBox_ResetContent(hwnd);
+ wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
+ wxT("invalid index in wxListBox::Selected") );
- m_noItems = 0;
- ListBox_GetHorizontalExtent(hwnd);
+ return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
}
-void wxListBox::SetSelection(const int N, const bool select)
-{
- if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
- SendMessage(hwnd, LB_SETSEL, select, N);
- else
- {
- int N1 = N;
- if (!select)
- N1 = -1;
- SendMessage(hwnd, LB_SETCURSEL, N1, 0);
- }
+wxClientData* wxListBox::DoGetItemClientObject(int n) const
+{
+ return (wxClientData *)DoGetItemClientData(n);
}
-bool wxListBox::Selected(const int N) const
+void *wxListBox::DoGetItemClientData(int n) const
{
- return SendMessage(hwnd, LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
+ wxCHECK_MSG( n >= 0 && n < m_noItems, NULL,
+ wxT("invalid index in wxListBox::GetClientData") );
+
+ return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0);
}
-void wxListBox::Deselect(const int N)
+void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
{
- if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
- SendMessage(hwnd, LB_SETSEL, FALSE, N);
+ DoSetItemClientData(n, clientData);
}
-char *wxListBox::GetClientData(const int N) const
+void wxListBox::DoSetItemClientData(int n, void *clientData)
{
- return (char *)SendMessage(hwnd, LB_GETITEMDATA, N, 0);
+ 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"));
}
-void wxListBox::SetClientData(const int N, char *Client_data)
+bool wxListBox::HasMultipleSelection() const
{
- if ( ListBox_SetItemData(hwnd, N, Client_data) == LB_ERR )
- wxLogDebug("LB_SETITEMDATA failed");
+ return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
}
// Return number of selections and an array of selected integers
int wxListBox::GetSelections(wxArrayInt& aSelections) const
{
- aSelections.Empty();
+ aSelections.Empty();
- if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
- {
- int no_sel = ListBox_GetSelCount(hwnd);
- if (no_sel != 0) {
- int *selections = new int[no_sel];
- if ( ListBox_GetSelItems(hwnd, no_sel, selections) == LB_ERR ) {
- wxFAIL_MSG("This listbox can't have single-selection style!");
- }
+ if ( HasMultipleSelection() )
+ {
+ int no_sel = ListBox_GetSelCount(GetHwnd());
+ if (no_sel != 0) {
+ int *selections = new int[no_sel];
+ int rc = ListBox_GetSelItems(GetHwnd(), no_sel, selections);
- aSelections.Alloc(no_sel);
- for ( int n = 0; n < no_sel; n++ )
- aSelections.Add(selections[n]);
+ wxCHECK_MSG(rc != LB_ERR, -1, wxT("ListBox_GetSelItems failed"));
- delete [] selections;
- }
+ aSelections.Alloc(no_sel);
+ for ( int n = 0; n < no_sel; n++ )
+ aSelections.Add(selections[n]);
- return no_sel;
- }
- else // single-selection listbox
- {
- aSelections.Add(ListBox_GetCurSel(hwnd));
+ delete [] selections;
+ }
- return 1;
- }
+ return no_sel;
+ }
+ else // single-selection listbox
+ {
+ if (ListBox_GetCurSel(GetHwnd()) > -1)
+ aSelections.Add(ListBox_GetCurSel(GetHwnd()));
+
+ return aSelections.Count();
+ }
}
// Get single selection, for single choice list items
int wxListBox::GetSelection() const
{
- wxCHECK_MSG( !(m_windowStyle & wxLB_MULTIPLE) &&
- !(m_windowStyle & wxLB_EXTENDED),
- -1,
- "GetSelection() can't be used with multiple-selection "
- "listboxes, use GetSelections() instead." );
+ wxCHECK_MSG( !HasMultipleSelection(),
+ -1,
+ wxT("GetSelection() can't be used with multiple-selection listboxes, use GetSelections() instead.") );
- return ListBox_GetCurSel(hwnd);
+ return ListBox_GetCurSel(GetHwnd());
}
// Find string for position
-wxString wxListBox::GetString(const int N) const
-{
- if (N < 0 || N > m_noItems)
- return wxString("");
-
- int len = (int)SendMessage(hwnd, LB_GETTEXT, N, (LONG)wxBuffer);
- wxBuffer[len] = 0;
- return wxString(wxBuffer);
-}
-
-void wxListBox::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+wxString wxListBox::GetString(int N) const
{
- int currentX, currentY;
- GetPosition(¤tX, ¤tY);
+ wxCHECK_MSG( N >= 0 && N < m_noItems, "",
+ wxT("invalid index in wxListBox::GetClientData") );
- int x1 = x;
- int y1 = y;
- int w1 = width;
- int h1 = height;
+ int len = ListBox_GetTextLen(GetHwnd(), N);
- if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- x1 = currentX;
- if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- y1 = currentY;
+ // +1 for terminating NUL
+ wxString result;
+ ListBox_GetText(GetHwnd(), N, result.GetWriteBuf(len + 1));
+ result.UngetWriteBuf();
- // If we're prepared to use the existing size, then...
- if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
- {
- GetSize(&w1, &h1);
- }
+ return result;
+}
- int cx; // button font dimensions
- int cy;
+void
+wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+{
+ wxCHECK_RET( pos >= 0 && pos <= m_noItems,
+ wxT("invalid index in wxListBox::InsertItems") );
- wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
+ int nItems = items.GetCount();
+ for ( int i = 0; i < nItems; i++ )
+ ListBox_InsertString(GetHwnd(), i + pos, items[i]);
+ m_noItems += nItems;
- float control_width, control_height, control_x, control_y;
+ SetHorizontalExtent();
+}
- // Deal with default size (using -1 values)
- if (w1<=0)
- w1 = DEFAULT_ITEM_WIDTH;
+void wxListBox::SetString(int N, const wxString& s)
+{
+ wxCHECK_RET( N >= 0 && N < m_noItems,
+ wxT("invalid index in wxListBox::SetString") );
- if (h1<=0)
- h1 = DEFAULT_ITEM_HEIGHT;
+ // remember the state of the item
+ bool wasSelected = IsSelected(N);
- control_x = (float)x1;
- control_y = (float)y1;
- control_width = (float)w1;
- control_height = (float)h1;
+ void *oldData = NULL;
+ wxClientData *oldObjData = NULL;
+ if ( m_clientDataItemsType == ClientData_Void )
+ oldData = GetClientData(N);
+ else if ( m_clientDataItemsType == ClientData_Object )
+ oldObjData = GetClientObject(N);
- // Calculations may have made size too small
- if (control_height <= 0)
- control_height = (float)DEFAULT_ITEM_HEIGHT;
+ // delete and recreate it
+ SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);
- if (control_width <= 0)
- control_width = (float)DEFAULT_ITEM_WIDTH;
+ int newN = N;
+ if ( N == m_noItems - 1 )
+ newN = -1;
-// wxDebugMsg("About to set the listbox height to %d", (int)control_height);
- MoveWindow(hwnd, (int)control_x, (int)control_y,
- (int)control_width, (int)control_height, TRUE);
+ ListBox_InsertString(GetHwnd(), newN, s);
-/*
-#if WXWIN_COMPATIBILITY
- GetEventHandler()->OldOnSize(width, height);
-#else
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.eventObject = this;
- GetEventHandler()->ProcessEvent(event);
-#endif
-*/
+ // restore the client data
+ if ( oldData )
+ SetClientData(N, oldData);
+ else if ( oldObjData )
+ SetClientObject(N, oldObjData);
+ // we may have lost the selection
+ if ( wasSelected )
+ Select(N);
+
+#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)
{
- // Only necessary if we want a horizontal scrollbar
- if (!(m_windowStyle & wxHSCROLL))
- return;
- TEXTMETRIC lpTextMetric;
-
- if (s != "")
- {
- int existingExtent = (int)SendMessage(hwnd, LB_GETHORIZONTALEXTENT, 0, 0L);
- HDC dc = GetWindowDC(hwnd);
- HFONT oldFont = 0;
- if (GetFont() && GetFont()->GetResourceHandle())
- oldFont = ::SelectObject(dc, (HFONT) GetFont()->GetResourceHandle());
-
- GetTextMetrics(dc, &lpTextMetric);
- SIZE extentXY;
- ::GetTextExtentPoint(dc, (LPSTR) (const char *)s, s.Length(), &extentXY);
- int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
-
- if (oldFont)
- ::SelectObject(dc, oldFont);
-
- ReleaseDC(hwnd, dc);
- if (extentX > existingExtent)
- SendMessage(hwnd, LB_SETHORIZONTALEXTENT, LOWORD(extentX), 0L);
- return;
- }
- else
- {
- int largestExtent = 0;
- HDC dc = GetWindowDC(hwnd);
- HFONT oldFont = 0;
- if (GetFont() && GetFont()->GetResourceHandle())
- oldFont = ::SelectObject(dc, (HFONT) GetFont()->GetResourceHandle());
-
- GetTextMetrics(dc, &lpTextMetric);
- int i;
- for (i = 0; i < m_noItems; i++)
+ // Only necessary if we want a horizontal scrollbar
+ if (!(m_windowStyle & wxHSCROLL))
+ return;
+ TEXTMETRIC lpTextMetric;
+
+ if ( !s.IsEmpty() )
{
- int len = (int)SendMessage(hwnd, LB_GETTEXT, i, (LONG)wxBuffer);
- wxBuffer[len] = 0;
- SIZE extentXY;
- ::GetTextExtentPoint(dc, (LPSTR)wxBuffer, len, &extentXY);
- int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
- if (extentX > largestExtent)
- largestExtent = extentX;
+ int existingExtent = (int)SendMessage(GetHwnd(), LB_GETHORIZONTALEXTENT, 0, 0L);
+ HDC dc = GetWindowDC(GetHwnd());
+ HFONT oldFont = 0;
+ if (GetFont().Ok() && GetFont().GetResourceHandle())
+ oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle());
+
+ GetTextMetrics(dc, &lpTextMetric);
+ SIZE extentXY;
+ ::GetTextExtentPoint(dc, (LPTSTR) (const wxChar *)s, s.Length(), &extentXY);
+ int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
+
+ if (oldFont)
+ ::SelectObject(dc, oldFont);
+
+ ReleaseDC(GetHwnd(), dc);
+ if (extentX > existingExtent)
+ SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(extentX), 0L);
+ }
+ else
+ {
+ int largestExtent = 0;
+ HDC dc = GetWindowDC(GetHwnd());
+ HFONT oldFont = 0;
+ if (GetFont().Ok() && GetFont().GetResourceHandle())
+ oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle());
+
+ GetTextMetrics(dc, &lpTextMetric);
+ int i;
+ for (i = 0; i < m_noItems; i++)
+ {
+ int len = (int)SendMessage(GetHwnd(), LB_GETTEXT, i, (LONG)wxBuffer);
+ wxBuffer[len] = 0;
+ SIZE extentXY;
+ ::GetTextExtentPoint(dc, (LPTSTR)wxBuffer, len, &extentXY);
+ int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
+ if (extentX > largestExtent)
+ largestExtent = extentX;
+ }
+ if (oldFont)
+ ::SelectObject(dc, oldFont);
+
+ ReleaseDC(GetHwnd(), dc);
+ SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L);
}
- if (oldFont)
- ::SelectObject(dc, oldFont);
-
- ReleaseDC(hwnd, dc);
- SendMessage(hwnd, LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L);
- }
}
-void
-wxListBox::InsertItems(const int nItems, const wxString items[], const int pos)
+wxSize wxListBox::DoGetBestSize() const
{
- int i;
- for (i = 0; i < nItems; i++)
- ListBox_InsertString(hwnd, i + pos, items[i]);
- m_noItems += nItems;
-
- #if USE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW ) {
- for ( i = 0; i < nItems; i++ ) {
- wxOwnerDrawn *pNewItem = CreateItem((uint)(pos + i));
- pNewItem->SetName(items[i]);
- m_aItems.Insert(pNewItem, (uint)(pos + i));
- ListBox_SetItemData(hwnd, i, pNewItem);
- }
+ // 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;
}
- #endif
- SetHorizontalExtent("");
-}
+ // give it some reasonable default value if there are no strings in the
+ // list
+ if ( wListbox == 0 )
+ wListbox = 100;
-void wxListBox::SetString(const int N, const wxString& s)
-{
- int sel = GetSelection();
-
- char *oldData = (char *)wxListBox::GetClientData(N);
-
- SendMessage(hwnd, LB_DELETESTRING, N, 0);
-
- int newN = N;
- if (N == (m_noItems - 1))
- newN = -1;
-
- SendMessage(hwnd, LB_INSERTSTRING, newN, (LPARAM) (const char *)s);
- if (oldData)
- wxListBox::SetClientData(N, oldData);
-
- // Selection may have changed
- if (sel >= 0)
- SetSelection(sel);
-
-#if USE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW )
- // update item's text
- m_aItems[N]->SetName(s);
-#endif //USE_OWNER_DRAWN
-}
+ // the listbox should be slightly larger than the widest string
+ int cx, cy;
+ wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
-int wxListBox::Number (void) const
-{
- return m_noItems;
-}
+ wListbox += 3*cx;
-// For single selection items only
-wxString wxListBox::GetStringSelection (void) const
-{
- int sel = GetSelection ();
- if (sel > -1)
- return this->GetString (sel);
- else
- return wxString("");
+ int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*(wxMax(m_noItems, 7));
+
+ return wxSize(wListbox, hListbox);
}
-bool wxListBox::SetStringSelection (const wxString& s, const bool flag)
+// ----------------------------------------------------------------------------
+// callbacks
+// ----------------------------------------------------------------------------
+
+bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
- int sel = FindString (s);
- if (sel > -1)
+ wxEventType evtType;
+ if ( param == LBN_SELCHANGE )
{
- SetSelection (sel, flag);
- return TRUE;
+ evtType = wxEVT_COMMAND_LISTBOX_SELECTED;
}
- 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;
+ evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
+ }
+ else
+ {
+ // some event we're not interested in
+ return FALSE;
}
- ProcessCommand (event);
-}
-
-WXHBRUSH wxListBox::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
- WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if CTL3D
- if ( m_useCtl3D )
- {
- HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
- return (WXHBRUSH) hbrush;
- }
-#endif
- if (GetParent()->GetTransparentBackground())
- SetBkMode((HDC) pDC, TRANSPARENT);
- else
- SetBkMode((HDC) pDC, OPAQUE);
+ wxCommandEvent event(evtType, m_windowId);
+ event.SetEventObject( this );
- ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
- ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
+ wxArrayInt aSelections;
+ int n, count = GetSelections(aSelections);
+ if ( count > 0 )
+ {
+ n = aSelections[0];
+ if ( HasClientObjectData() )
+ event.SetClientObject( GetClientObject(n) );
+ else if ( HasClientUntypedData() )
+ event.SetClientData( GetClientData(n) );
+ event.SetString( GetString(n) );
+ }
+ else
+ {
+ n = -1;
+ }
- wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+ event.m_commandInt = n;
- // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
- // has a zero usage count.
- backgroundBrush->RealizeResource();
- return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+ return GetEventHandler()->ProcessEvent(event);
}
-long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-/*
- switch (nMsg)
- {
- case WM_INITDIALOG:
- case WM_ACTIVATE:
- case WM_SETFOCUS:
- case WM_KILLFOCUS:
- case WM_CREATE:
- case WM_PAINT:
- case WM_QUERYDRAGICON:
- case WM_SIZE:
- case WM_RBUTTONDOWN:
- case WM_RBUTTONUP:
- case WM_RBUTTONDBLCLK:
- case WM_MBUTTONDOWN:
- case WM_MBUTTONUP:
- case WM_MBUTTONDBLCLK:
- case WM_LBUTTONDOWN:
- case WM_LBUTTONUP:
-// case WM_LBUTTONDBLCLK:
- case WM_MOUSEMOVE:
- case WM_DESTROY:
- case WM_COMMAND:
- case WM_NOTIFY:
- case WM_MENUSELECT:
- case WM_INITMENUPOPUP:
- case WM_DRAWITEM:
- case WM_MEASUREITEM:
- case WM_KEYDOWN:
- case WM_KEYUP:
- case WM_CHAR: // Always an ASCII character
- case WM_HSCROLL:
- case WM_VSCROLL:
- case WM_CTLCOLORBTN:
- case WM_CTLCOLORDLG:
- case WM_CTLCOLORLISTBOX:
- case WM_CTLCOLORMSGBOX:
- case WM_CTLCOLORSCROLLBAR:
- case WM_CTLCOLORSTATIC:
- case WM_CTLCOLOREDIT:
- case WM_SYSCOLORCHANGE:
- case WM_ERASEBKGND:
- case WM_MDIACTIVATE:
- case WM_DROPFILES:
- case WM_QUERYENDSESSION:
- case WM_CLOSE:
- case WM_GETMINMAXINFO:
- case WM_NCHITTEST:
- return MSWDefWindowProc(nMsg, wParam, lParam );
- }
-*/
- return wxControl::MSWWindowProc(nMsg, wParam, lParam);
-}
+// ----------------------------------------------------------------------------
+// wxCheckListBox support
+// ----------------------------------------------------------------------------
-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
// drawing
// -------
#define OWNER_DRAWN_LISTBOX_EXTRA_SPACE (1)
// the height is the same for all items
-// ## should be changed for LBS_OWNERDRAWVARIABLE style listboxes
-// NB: can't forward this to wxListBoxItem because LB_SETITEMDATA
-// message is not yet sent when we get here!
+// TODO should be changed for LBS_OWNERDRAWVARIABLE style listboxes
+
+// NB: can't forward this to wxListBoxItem because LB_SETITEMDATA
+// message is not yet sent when we get here!
bool wxListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
{
- // only owner-drawn control should receive this message
- wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE );
+ // only owner-drawn control should receive this message
+ wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE );
+
+ MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
+
+ HDC hdc = CreateIC(wxT("DISPLAY"), NULL, NULL, 0);
- MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
+ wxDC dc;
+ dc.SetHDC((WXHDC)hdc);
+ dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
- wxDC dc;
- dc.SetHDC((WXHDC)CreateIC("DISPLAY", NULL, NULL, 0));
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
+ pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
+ pStruct->itemWidth = dc.GetCharWidth();
- pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
- pStruct->itemWidth = dc.GetCharWidth();
+ dc.SetHDC(0);
- return TRUE;
+ DeleteDC(hdc);
+
+ return TRUE;
}
// forward the message to the appropriate item
bool wxListBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
{
- // only owner-drawn control should receive this message
- wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE );
+ // only owner-drawn control should receive this message
+ wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE );
+
+ DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item;
+ UINT itemID = pStruct->itemID;
+
+ // the item may be -1 for an empty listbox
+ if ( itemID == (UINT)-1 )
+ return FALSE;
+
+ long data = ListBox_GetItemData(GetHwnd(), pStruct->itemID);
- DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item;
- wxListBoxItem *pItem = (wxListBoxItem *)SendMessage(hwnd, LB_GETITEMDATA,
- pStruct->itemID, 0);
+ wxCHECK( data && (data != LB_ERR), FALSE );
- wxCHECK( (int)pItem != LB_ERR, FALSE );
+ wxListBoxItem *pItem = (wxListBoxItem *)data;
- wxDC dc;
- dc.SetHDC((WXHDC)pStruct->hDC, FALSE);
- wxRect rect(pStruct->rcItem.left, pStruct->rcItem.top,
- pStruct->rcItem.right - pStruct->rcItem.left,
- pStruct->rcItem.bottom - pStruct->rcItem.top);
+ wxDC dc;
+ dc.SetHDC((WXHDC)pStruct->hDC, FALSE);
+ wxRect rect(wxPoint(pStruct->rcItem.left, pStruct->rcItem.top),
+ wxPoint(pStruct->rcItem.right, pStruct->rcItem.bottom));
- return pItem->OnDrawItem(dc, rect,
- (wxOwnerDrawn::wxODAction)pStruct->itemAction,
- (wxOwnerDrawn::wxODStatus)pStruct->itemState);
+ return pItem->OnDrawItem(dc, rect,
+ (wxOwnerDrawn::wxODAction)pStruct->itemAction,
+ (wxOwnerDrawn::wxODStatus)pStruct->itemState);
}
#endif
- // USE_OWNER_DRAWN
+ // wxUSE_OWNER_DRAWN
projects / wxWidgets.git / blobdiff