projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxTo/FromString() overloads for wxFont (1st part of patch 1760073)
[wxWidgets.git]
/
src
/
generic
/
imaglist.cpp
diff --git
a/src/generic/imaglist.cpp
b/src/generic/imaglist.cpp
index 4fbf79d9df726de15425241b44e9bca2cf7c533c..72eb445d73d312dd5c2ca4496992b8d9d4da6fad 100644
(file)
--- a/
src/generic/imaglist.cpp
+++ b/
src/generic/imaglist.cpp
@@
-14,11
+14,11
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_IMAGLIST
+#if wxUSE_IMAGLIST
&& !defined(wxHAS_NATIVE_IMAGELIST)
#ifndef __WXPALMOS__
#ifndef __WXPALMOS__
-#include "wx/
generic/
imaglist.h"
+#include "wx/imaglist.h"
#ifndef WX_PRECOMP
#include "wx/dc.h"
#ifndef WX_PRECOMP
#include "wx/dc.h"
@@
-31,15
+31,7
@@
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)
-
-#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
-/*
- * wxImageList has to be a real class or we have problems with
- * the run-time information.
- */
-
IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList)
IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList)
-#endif
wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount )
{
wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount )
{