AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More tweaks so wxGenericListCtrl only uses generic

Browse Source 
components


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2002-07-30 16:01:35 +00:00
parent 0deff0880d
commit 9cb0795323
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/generic/listctrl.h
View File

@ -17,7 +17,12 @@
#include "wx/defs.h"
#include "wx/object.h"
#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
#include "wx/generic/imaglist.h"
#else
#include "wx/imaglist.h"
#endif
#include "wx/control.h"
#include "wx/timer.h"
#include "wx/dcclient.h"
@ -114,9 +119,9 @@ public:
void SetWindowStyleFlag( long style );
void RecreateWindow() {}
long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const;
wxImageList *GetImageList( int which ) const;
void SetImageList( wxImageList *imageList, int which );
void AssignImageList( wxImageList *imageList, int which );
wxGenericImageList *GetImageList( int which ) const;
void SetImageList( wxGenericImageList *imageList, int which );
void AssignImageList( wxGenericImageList *imageList, int which );
bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
void ClearAll();
@ -183,9 +188,9 @@ public:
// implementation
// --------------
wxImageList *m_imageListNormal;
wxImageList *m_imageListSmall;
wxImageList *m_imageListState; // what's that ?
wxGenericImageList *m_imageListNormal;
wxGenericImageList *m_imageListSmall;
wxGenericImageList *m_imageListState; // what's that ?
bool m_ownsImageListNormal,
m_ownsImageListSmall,
m_ownsImageListState;

33
src/generic/listctrl.cpp
View File

@ -47,8 +47,7 @@
#include "wx/textctrl.h"
#endif
#include "wx/imaglist.h"
#include "wx/listctrl.h"
#include "wx/generic/listctrl.h"
#if defined(__WXGTK__)
#include <gtk/gtk.h>
@ -646,7 +645,7 @@ public:
void GetImageSize( int index, int &width, int &height ) const;
int GetTextLength( const wxString &s ) const;
void SetImageList( wxImageList *imageList, int which );
void SetImageList( wxGenericImageList *imageList, int which );
void SetItemSpacing( int spacing, bool isSmall = FALSE );
int GetItemSpacing( bool isSmall = FALSE );
@ -775,8 +774,8 @@ public:
wxColour *m_highlightColour;
int m_xScroll,
m_yScroll;
wxImageList *m_small_image_list;
wxImageList *m_normal_image_list;
wxGenericImageList *m_small_image_list;
wxGenericImageList *m_normal_image_list;
int m_small_spacing;
int m_normal_spacing;
bool m_hasFocus;
@ -1922,7 +1921,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
int image = item.m_image;
if ( image != -1 )
{
wxImageList *imageList = m_owner->m_small_image_list;
wxGenericImageList *imageList = m_owner->m_small_image_list;
if ( imageList )
{
int ix, iy;
@ -2280,8 +2279,8 @@ void wxListMainWindow::Init()
m_headerWidth =
m_lineHeight = 0;
m_small_image_list = (wxImageList *) NULL;
m_normal_image_list = (wxImageList *) NULL;
m_small_image_list = (wxGenericImageList *) NULL;
m_normal_image_list = (wxGenericImageList *) NULL;
m_small_spacing = 30;
m_normal_spacing = 40;
@ -3529,7 +3528,7 @@ int wxListMainWindow::GetTextLength( const wxString &s ) const
return lw + AUTOSIZE_COL_MARGIN;
}
void wxListMainWindow::SetImageList( wxImageList *imageList, int which )
void wxListMainWindow::SetImageList( wxGenericImageList *imageList, int which )
{
m_dirty = TRUE;
@ -4532,9 +4531,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
wxGenericListCtrl::wxGenericListCtrl()
{
m_imageListNormal = (wxImageList *) NULL;
m_imageListSmall = (wxImageList *) NULL;
m_imageListState = (wxImageList *) NULL;
m_imageListNormal = (wxGenericImageList *) NULL;
m_imageListSmall = (wxGenericImageList *) NULL;
m_imageListState = (wxGenericImageList *) NULL;
m_ownsImageListNormal =
m_ownsImageListSmall =
@ -4575,7 +4574,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
{
m_imageListNormal =
m_imageListSmall =
m_imageListState = (wxImageList *) NULL;
m_imageListState = (wxGenericImageList *) NULL;
m_ownsImageListNormal =
m_ownsImageListSmall =
m_ownsImageListState = FALSE;
@ -4879,7 +4878,7 @@ long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const
return m_mainWin->GetNextItem( item, geom, state );
}
wxImageList *wxGenericListCtrl::GetImageList(int which) const
wxGenericImageList *wxGenericListCtrl::GetImageList(int which) const
{
if (which == wxIMAGE_LIST_NORMAL)
{
@ -4893,10 +4892,10 @@ wxImageList *wxGenericListCtrl::GetImageList(int which) const
{
return m_imageListState;
}
return (wxImageList *) NULL;
return (wxGenericImageList *) NULL;
}
void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which )
void wxGenericListCtrl::SetImageList( wxGenericImageList *imageList, int which )
{
if ( which == wxIMAGE_LIST_NORMAL )
{
@ -4920,7 +4919,7 @@ void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which )
m_mainWin->SetImageList( imageList, which );
}
void wxGenericListCtrl::AssignImageList(wxImageList *imageList, int which)
void wxGenericListCtrl::AssignImageList(wxGenericImageList *imageList, int which)
{
SetImageList(imageList, which);
if ( which == wxIMAGE_LIST_NORMAL )