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

Applied patch [ 583922 ] Make generic/wxListCtrl avail. in WIN32

Browse Source 
Generic wxListCtrl renamed to wxGenericListCtrl, wxImageList
renamed to wxGenericImageList, so they can be used on wxMSW
(Rene Rivera).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-07-22 08:51:49 +00:00
parent 70a2c6562f
commit 3cd94a0d11
11 changed files with 164 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/generic/imaglist.h
View File

@@ -34,6 +34,8 @@
* used.
*/
#if !defined(wxIMAGELIST_DRAW_NORMAL)
// Flags for Draw
#define wxIMAGELIST_DRAW_NORMAL 0x0001
#define wxIMAGELIST_DRAW_TRANSPARENT 0x0002
@@ -47,17 +49,19 @@ enum {
wxIMAGE_LIST_STATE // State icons: unimplemented (see WIN32 documentation)
};
class WXDLLEXPORT wxImageList: public wxObject
#endif
class WXDLLEXPORT wxGenericImageList: public wxObject
{
public:
wxImageList() { }
wxImageList( int width, int height, bool mask = TRUE, int initialCount = 1 );
~wxImageList();
wxGenericImageList() { }
wxGenericImageList( int width, int height, bool mask = TRUE, int initialCount = 1 );
~wxGenericImageList();
bool Create( int width, int height, bool mask = TRUE, int initialCount = 1 );
bool Create();
int GetImageCount() const;
bool GetSize( int index, int &width, int &height ) const;
virtual int GetImageCount() const;
virtual bool GetSize( int index, int &width, int &height ) const;
int Add( const wxBitmap& bitmap );
int Add( const wxBitmap& bitmap, const wxBitmap& mask );
@@ -67,7 +71,7 @@ public:
bool Remove( int index );
bool RemoveAll();
bool Draw(int index, wxDC& dc, int x, int y,
virtual bool Draw(int index, wxDC& dc, int x, int y,
int flags = wxIMAGELIST_DRAW_NORMAL,
bool solidBackground = FALSE);
@@ -77,7 +81,7 @@ private:
int m_width;
int m_height;
DECLARE_DYNAMIC_CLASS(wxImageList)
DECLARE_DYNAMIC_CLASS(wxGenericImageList)
};
#endif // __IMAGELISTH_G__