X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..f46f4c86b234d87b9c1db889cc130d2d7d31c306:/include/wx/generic/imaglist.h diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h index 288c7444b4..3eef4e40cc 100644 --- a/include/wx/generic/imaglist.h +++ b/include/wx/generic/imaglist.h @@ -11,7 +11,7 @@ #ifndef __IMAGELISTH_G__ #define __IMAGELISTH_G__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "imaglist.h" #endif @@ -56,7 +56,7 @@ enum { class WXDLLEXPORT wxGenericImageList: public wxObject { public: - wxGenericImageList() { } + wxGenericImageList() { m_width = m_height = 0; } wxGenericImageList( int width, int height, bool mask = TRUE, int initialCount = 1 ); ~wxGenericImageList(); bool Create( int width, int height, bool mask = TRUE, int initialCount = 1 ); @@ -86,7 +86,7 @@ private: DECLARE_DYNAMIC_CLASS(wxGenericImageList) }; -#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__) +#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) /* * wxImageList has to be a real class or we have problems with * the run-time information. @@ -104,7 +104,7 @@ public: { } }; -#endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__ +#endif // !__WXMSW__ || __WXUNIVERSAL__ #endif // __IMAGELISTH_G__