X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2bc1d69812f8fc3f6ae24508a9d007ad5d00ede..7f8bd9fc5ff34562a7e5c411d95cef99582f7aab:/src/generic/listctrl.cpp diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 9467a18a5b..07efb80c21 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -23,34 +23,28 @@ #if wxUSE_LISTCTRL -// under Win32 we always use the native version and also may use the generic -// one, however some things should be done only if we use only the generic -// version -#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXMAC__) - #define HAVE_NATIVE_LISTCTRL -#endif - -// if we have the native control, wx/listctrl.h declares it and not this one #include "wx/listctrl.h" -#ifndef HAVE_NATIVE_LISTCTRL +#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && !defined(__WXMAC__) // if we have a native version, its implementation file does all this IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl) IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent) IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl) -#endif // HAVE_NATIVE_LISTCTRL/!HAVE_NATIVE_LISTCTRL +#endif #ifndef WX_PRECOMP + #include "wx/scrolwin.h" + #include "wx/timer.h" + #include "wx/settings.h" #include "wx/dynarray.h" - #include "wx/app.h" + #include "wx/dcclient.h" #include "wx/dcscreen.h" - #include "wx/textctrl.h" - #include "wx/listbox.h" #include "wx/math.h" #endif +#include "wx/imaglist.h" #include "wx/selstore.h" #include "wx/renderer.h" @@ -618,7 +612,7 @@ public: void GetImageSize( int index, int &width, int &height ) const; int GetTextLength( const wxString &s ) const; - void SetImageList( wxImageListType *imageList, int which ); + void SetImageList( wxImageList *imageList, int which ); void SetItemSpacing( int spacing, bool isSmall = false ); int GetItemSpacing( bool isSmall = false ); @@ -750,8 +744,8 @@ public: bool m_dirty; wxColour *m_highlightColour; - wxImageListType *m_small_image_list; - wxImageListType *m_normal_image_list; + wxImageList *m_small_image_list; + wxImageList *m_normal_image_list; int m_small_spacing; int m_normal_spacing; bool m_hasFocus; @@ -894,7 +888,7 @@ void wxListItemData::SetItem( const wxListItem &info ) if ( info.HasAttributes() ) { if ( m_attr ) - *m_attr = *info.GetAttributes(); + m_attr->AssignFrom(*info.GetAttributes()); else m_attr = new wxListItemAttr(*info.GetAttributes()); } @@ -1386,7 +1380,11 @@ bool wxListLineData::SetAttributes(wxDC *dc, // arithmetics on wxColour, unfortunately) wxColour colText; if ( highlighted ) +#ifdef __WXMAC__ + colText = *wxWHITE; +#else colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); +#endif else if ( attr && attr->HasTextColour() ) colText = attr->GetTextColour(); else @@ -1745,7 +1743,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) static const int MARGIN_BETWEEN_TEXT_AND_ICON = 2; int ix = 0, iy = 0; // init them just to suppress the compiler warnings const int image = item.m_image; - wxImageListType *imageList; + wxImageList *imageList; if ( image != -1 ) { imageList = m_owner->m_small_image_list; @@ -2147,8 +2145,8 @@ void wxListMainWindow::Init() m_headerWidth = m_lineHeight = 0; - m_small_image_list = (wxImageListType *) NULL; - m_normal_image_list = (wxImageListType *) NULL; + m_small_image_list = (wxImageList *) NULL; + m_normal_image_list = (wxImageList *) NULL; m_small_spacing = 30; m_normal_spacing = 40; @@ -2188,23 +2186,39 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, { Init(); + +#ifdef __WXMAC__ + // OS X sel item highlight color differs from text highlight color, which is + // what wxSYS_COLOUR_HIGHLIGHT returns. + RGBColor hilight; + GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &hilight); + m_highlightBrush = new wxBrush( wxColour(hilight.red, hilight.green, hilight.blue ), wxSOLID ); +#else m_highlightBrush = new wxBrush - ( + ( wxSystemSettings::GetColour ( wxSYS_COLOUR_HIGHLIGHT ), wxSOLID - ); + ); +#endif +#ifdef __WXMAC__ + // on Mac, this color also differs from the wxSYS_COLOUR_BTNSHADOW, enough to be noticable. + // I don't know if BTNSHADOW is appropriate in other contexts, so I'm just changing it here. + GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &hilight); + m_highlightUnfocusedBrush = new wxBrush( wxColour(hilight.red, hilight.green, hilight.blue ), wxSOLID ); +#else m_highlightUnfocusedBrush = new wxBrush - ( - wxSystemSettings::GetColour - ( - wxSYS_COLOUR_BTNSHADOW - ), - wxSOLID - ); + ( + wxSystemSettings::GetColour + ( + wxSYS_COLOUR_BTNSHADOW + ), + wxSOLID + ); +#endif SetScrollbars( 0, 0, 0, 0, 0, 0 ); @@ -3453,7 +3467,7 @@ int wxListMainWindow::GetTextLength( const wxString &s ) const return lw + AUTOSIZE_COL_MARGIN; } -void wxListMainWindow::SetImageList( wxImageListType *imageList, int which ) +void wxListMainWindow::SetImageList( wxImageList *imageList, int which ) { m_dirty = true; @@ -3952,6 +3966,8 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const void wxListMainWindow::RecalculatePositions(bool noRefresh) { + const int lineHeight = GetLineHeight(); + wxClientDC dc( this ); dc.SetFont( GetFont() ); @@ -3985,8 +4001,6 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) clientHeight; GetSize( &clientWidth, &clientHeight ); - const int lineHeight = GetLineHeight(); - if ( InReportView() ) { // all lines have the same height and we scroll one line per step @@ -4688,9 +4702,9 @@ END_EVENT_TABLE() wxGenericListCtrl::wxGenericListCtrl() { - m_imageListNormal = (wxImageListType *) NULL; - m_imageListSmall = (wxImageListType *) NULL; - m_imageListState = (wxImageListType *) NULL; + m_imageListNormal = (wxImageList *) NULL; + m_imageListSmall = (wxImageList *) NULL; + m_imageListState = (wxImageList *) NULL; m_ownsImageListNormal = m_ownsImageListSmall = @@ -4760,7 +4774,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent, { m_imageListNormal = m_imageListSmall = - m_imageListState = (wxImageListType *) NULL; + m_imageListState = (wxImageList *) NULL; m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = false; @@ -5126,7 +5140,7 @@ long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const return m_mainWin->GetNextItem( item, geom, state ); } -wxImageListType *wxGenericListCtrl::GetImageList(int which) const +wxImageList *wxGenericListCtrl::GetImageList(int which) const { if (which == wxIMAGE_LIST_NORMAL) return m_imageListNormal; @@ -5135,10 +5149,10 @@ wxImageListType *wxGenericListCtrl::GetImageList(int which) const else if (which == wxIMAGE_LIST_STATE) return m_imageListState; - return (wxImageListType *) NULL; + return (wxImageList *) NULL; } -void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which ) +void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which ) { if ( which == wxIMAGE_LIST_NORMAL ) { @@ -5165,7 +5179,7 @@ void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which ) m_mainWin->SetImageList( imageList, which ); } -void wxGenericListCtrl::AssignImageList(wxImageListType *imageList, int which) +void wxGenericListCtrl::AssignImageList(wxImageList *imageList, int which) { SetImageList(imageList, which); if ( which == wxIMAGE_LIST_NORMAL )