Applied patch [ 858324 ] Calling EndModal inside an EVT_INIT_DIALOG event handler

[wxWidgets.git] / include / wx / generic / imaglist.h

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index be21d3dcfa6a0188573f357ae5645471d793ccba..72c4f686946defd3ea23baa7f4d0355e199f3ab3 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -4,21 +4,23 @@
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __IMAGELISTH_G__
 #define __IMAGELISTH_G__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __IMAGELISTH_G__
 #define __IMAGELISTH_G__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "imaglist.h"
 #endif
 
 #include "wx/defs.h"
 #pragma interface "imaglist.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/gdicmn.h"
-#include "wx/bitmap.h"
-#include "wx/dc.h"
+#include "wx/list.h"
+
+class WXDLLEXPORT wxDC;
+class WXDLLEXPORT wxBitmap;
+class WXDLLEXPORT wxColour;

 
 /*
  * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to
 
 /*
  * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to


@@ -54,7 +56,7 @@ enum {
 class WXDLLEXPORT wxGenericImageList: public wxObject
 {
 public:
 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 );
     wxGenericImageList( int width, int height, bool mask = TRUE, int initialCount = 1 );
     ~wxGenericImageList();
     bool Create( int width, int height, bool mask = TRUE, int initialCount = 1 );