Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using wxImageListType instead of wxGenericImageList

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-08-28 09:31:29 +00:00
parent f9ceab7ce6
commit 80020b62f9
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/generic/listctrl.cpp
View File

@@ -54,12 +54,8 @@
#if defined(__WIN32__) && !defined(__WXUNIVERSAL__) #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
#include "wx/generic/listctrl.h" #include "wx/generic/listctrl.h"
#define wxImageListType wxGenericImageList
#else #else
#include "wx/listctrl.h" #include "wx/listctrl.h"
#define wxImageListType wxImageList
#endif #endif
#if defined(__WXGTK__) #if defined(__WXGTK__)
@@ -658,7 +654,7 @@ public:
void GetImageSize( int index, int &width, int &height ) const; void GetImageSize( int index, int &width, int &height ) const;
int GetTextLength( const wxString &s ) const; int GetTextLength( const wxString &s ) const;
void SetImageList( wxGenericImageList *imageList, int which ); void SetImageList( wxImageListType *imageList, int which );
void SetItemSpacing( int spacing, bool isSmall = FALSE ); void SetItemSpacing( int spacing, bool isSmall = FALSE );
int GetItemSpacing( bool isSmall = FALSE ); int GetItemSpacing( bool isSmall = FALSE );
@@ -787,8 +783,8 @@ public:
wxColour *m_highlightColour; wxColour *m_highlightColour;
int m_xScroll, int m_xScroll,
m_yScroll; m_yScroll;
wxGenericImageList *m_small_image_list; wxImageListType *m_small_image_list;
wxGenericImageList *m_normal_image_list; wxImageListType *m_normal_image_list;
int m_small_spacing; int m_small_spacing;
int m_normal_spacing; int m_normal_spacing;
bool m_hasFocus; bool m_hasFocus;
@@ -1934,7 +1930,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
int image = item.m_image; int image = item.m_image;
if ( image != -1 ) if ( image != -1 )
{ {
wxGenericImageList *imageList = m_owner->m_small_image_list; wxImageListType *imageList = m_owner->m_small_image_list;
if ( imageList ) if ( imageList )
{ {
int ix, iy; int ix, iy;
@@ -2292,8 +2288,8 @@ void wxListMainWindow::Init()
m_headerWidth = m_headerWidth =
m_lineHeight = 0; m_lineHeight = 0;
m_small_image_list = (wxGenericImageList *) NULL; m_small_image_list = (wxImageListType *) NULL;
m_normal_image_list = (wxGenericImageList *) NULL; m_normal_image_list = (wxImageListType *) NULL;
m_small_spacing = 30; m_small_spacing = 30;
m_normal_spacing = 40; m_normal_spacing = 40;
@@ -3543,7 +3539,7 @@ int wxListMainWindow::GetTextLength( const wxString &s ) const
return lw + AUTOSIZE_COL_MARGIN; return lw + AUTOSIZE_COL_MARGIN;
} }
void wxListMainWindow::SetImageList( wxGenericImageList *imageList, int which ) void wxListMainWindow::SetImageList( wxImageListType *imageList, int which )
{ {
m_dirty = TRUE; m_dirty = TRUE;
@@ -4546,9 +4542,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
wxGenericListCtrl::wxGenericListCtrl() wxGenericListCtrl::wxGenericListCtrl()
{ {
m_imageListNormal = (wxGenericImageList *) NULL; m_imageListNormal = (wxImageListType *) NULL;
m_imageListSmall = (wxGenericImageList *) NULL; m_imageListSmall = (wxImageListType *) NULL;
m_imageListState = (wxGenericImageList *) NULL; m_imageListState = (wxImageListType *) NULL;
m_ownsImageListNormal = m_ownsImageListNormal =
m_ownsImageListSmall = m_ownsImageListSmall =
@@ -4589,7 +4585,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
{ {
m_imageListNormal = m_imageListNormal =
m_imageListSmall = m_imageListSmall =
m_imageListState = (wxGenericImageList *) NULL; m_imageListState = (wxImageListType *) NULL;
m_ownsImageListNormal = m_ownsImageListNormal =
m_ownsImageListSmall = m_ownsImageListSmall =
m_ownsImageListState = FALSE; m_ownsImageListState = FALSE;
@@ -4893,7 +4889,7 @@ long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const
return m_mainWin->GetNextItem( item, geom, state ); return m_mainWin->GetNextItem( item, geom, state );
} }
wxGenericImageList *wxGenericListCtrl::GetImageList(int which) const wxImageListType *wxGenericListCtrl::GetImageList(int which) const
{ {
if (which == wxIMAGE_LIST_NORMAL) if (which == wxIMAGE_LIST_NORMAL)
{ {
@@ -4907,10 +4903,10 @@ wxGenericImageList *wxGenericListCtrl::GetImageList(int which) const
{ {
return m_imageListState; return m_imageListState;
} }
return (wxGenericImageList *) NULL; return (wxImageListType *) NULL;
} }
void wxGenericListCtrl::SetImageList( wxGenericImageList *imageList, int which ) void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which )
{ {
if ( which == wxIMAGE_LIST_NORMAL ) if ( which == wxIMAGE_LIST_NORMAL )
{ {
@@ -4934,7 +4930,7 @@ void wxGenericListCtrl::SetImageList( wxGenericImageList *imageList, int which )
m_mainWin->SetImageList( imageList, which ); m_mainWin->SetImageList( imageList, which );
} }
void wxGenericListCtrl::AssignImageList(wxGenericImageList *imageList, int which) void wxGenericListCtrl::AssignImageList(wxImageListType *imageList, int which)
{ {
SetImageList(imageList, which); SetImageList(imageList, which);
if ( which == wxIMAGE_LIST_NORMAL ) if ( which == wxIMAGE_LIST_NORMAL )