From b5a7cdc076ec7a35990b2da37a4b7b81a9cc8f85 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Sat, 27 Jul 2002 20:12:21 +0000 Subject: [PATCH] Rename wxGenericImageList to wxImageList in generic wxListCtrl, too. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/listctrl.h | 12 ++++++------ src/generic/listctrl.cpp | 32 ++++++++++++++++---------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 0576e00126..9765d60ced 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -114,9 +114,9 @@ public: void SetWindowStyleFlag( long style ); void RecreateWindow() {} long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const; - wxGenericImageList *GetImageList( int which ) const; - void SetImageList( wxGenericImageList *imageList, int which ); - void AssignImageList( wxGenericImageList *imageList, int which ); + wxImageList *GetImageList( int which ) const; + void SetImageList( wxImageList *imageList, int which ); + void AssignImageList( wxImageList *imageList, int which ); bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC void ClearAll(); @@ -183,9 +183,9 @@ public: // implementation // -------------- - wxGenericImageList *m_imageListNormal; - wxGenericImageList *m_imageListSmall; - wxGenericImageList *m_imageListState; // what's that ? + wxImageList *m_imageListNormal; + wxImageList *m_imageListSmall; + wxImageList *m_imageListState; // what's that ? bool m_ownsImageListNormal, m_ownsImageListSmall, m_ownsImageListState; diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 6cfc4bec2c..3c6eb23cf8 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -646,7 +646,7 @@ public: void GetImageSize( int index, int &width, int &height ) const; int GetTextLength( const wxString &s ) const; - void SetImageList( wxGenericImageList *imageList, int which ); + void SetImageList( wxImageList *imageList, int which ); void SetItemSpacing( int spacing, bool isSmall = FALSE ); int GetItemSpacing( bool isSmall = FALSE ); @@ -775,8 +775,8 @@ public: wxColour *m_highlightColour; int m_xScroll, m_yScroll; - wxGenericImageList *m_small_image_list; - wxGenericImageList *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; @@ -1922,7 +1922,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) int image = item.m_image; if ( image != -1 ) { - wxGenericImageList *imageList = m_owner->m_small_image_list; + wxImageList *imageList = m_owner->m_small_image_list; if ( imageList ) { int ix, iy; @@ -2280,8 +2280,8 @@ void wxListMainWindow::Init() m_headerWidth = m_lineHeight = 0; - m_small_image_list = (wxGenericImageList *) NULL; - m_normal_image_list = (wxGenericImageList *) NULL; + m_small_image_list = (wxImageList *) NULL; + m_normal_image_list = (wxImageList *) NULL; m_small_spacing = 30; m_normal_spacing = 40; @@ -3529,7 +3529,7 @@ int wxListMainWindow::GetTextLength( const wxString &s ) const return lw + AUTOSIZE_COL_MARGIN; } -void wxListMainWindow::SetImageList( wxGenericImageList *imageList, int which ) +void wxListMainWindow::SetImageList( wxImageList *imageList, int which ) { m_dirty = TRUE; @@ -4511,7 +4511,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl) #if !defined(__WIN32__) -IMPLEMENT_DYNAMIC_CLASS(wxListView, wxGenericListCtrl) +IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl) IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent) #endif @@ -4532,9 +4532,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl) wxGenericListCtrl::wxGenericListCtrl() { - m_imageListNormal = (wxGenericImageList *) NULL; - m_imageListSmall = (wxGenericImageList *) NULL; - m_imageListState = (wxGenericImageList *) NULL; + m_imageListNormal = (wxImageList *) NULL; + m_imageListSmall = (wxImageList *) NULL; + m_imageListState = (wxImageList *) NULL; m_ownsImageListNormal = m_ownsImageListSmall = @@ -4575,7 +4575,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent, { m_imageListNormal = m_imageListSmall = - m_imageListState = (wxGenericImageList *) NULL; + m_imageListState = (wxImageList *) NULL; m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = FALSE; @@ -4879,7 +4879,7 @@ long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const return m_mainWin->GetNextItem( item, geom, state ); } -wxGenericImageList *wxGenericListCtrl::GetImageList(int which) const +wxImageList *wxGenericListCtrl::GetImageList(int which) const { if (which == wxIMAGE_LIST_NORMAL) { @@ -4893,10 +4893,10 @@ wxGenericImageList *wxGenericListCtrl::GetImageList(int which) const { return m_imageListState; } - return (wxGenericImageList *) NULL; + return (wxImageList *) NULL; } -void wxGenericListCtrl::SetImageList( wxGenericImageList *imageList, int which ) +void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which ) { if ( which == wxIMAGE_LIST_NORMAL ) { @@ -4920,7 +4920,7 @@ void wxGenericListCtrl::SetImageList( wxGenericImageList *imageList, int which ) m_mainWin->SetImageList( imageList, which ); } -void wxGenericListCtrl::AssignImageList(wxGenericImageList *imageList, int which) +void wxGenericListCtrl::AssignImageList(wxImageList *imageList, int which) { SetImageList(imageList, which); if ( which == wxIMAGE_LIST_NORMAL ) -- 2.45.2