Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 72ce155305c8d667187bd55ed01913962a92f220..288c7444b423ad00d53232b888a2477909df8934 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -1,24 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imaglist.h
+// Name:        wx/generic/imaglist.h

 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __IMAGELISTH_G__
 #define __IMAGELISTH_G__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __IMAGELISTH_G__
 #define __IMAGELISTH_G__
 

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

 #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


@@ -34,6 +36,8 @@
  * used.
  */
 
  * used.
  */
 

+#if !defined(wxIMAGELIST_DRAW_NORMAL)
+

 // Flags for Draw
 #define wxIMAGELIST_DRAW_NORMAL         0x0001
 #define wxIMAGELIST_DRAW_TRANSPARENT    0x0002
 // Flags for Draw
 #define wxIMAGELIST_DRAW_NORMAL         0x0001
 #define wxIMAGELIST_DRAW_TRANSPARENT    0x0002


@@ -47,31 +51,60 @@ enum {
     wxIMAGE_LIST_STATE   // State icons: unimplemented (see WIN32 documentation)
 };
 
     wxIMAGE_LIST_STATE   // State icons: unimplemented (see WIN32 documentation)
 };
 

-class wxImageList: public wxObject
-{
-   DECLARE_DYNAMIC_CLASS(wxImageList)
-   
-  public:
+#endif

 
 

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

-    int GetImageCount() const;
-    int Add( const wxBitmap &bitmap );
+
+    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 );
+    int Add( const wxBitmap& bitmap, const wxColour& maskColour );
+    const wxBitmap *GetBitmap(int index) const;

     bool Replace( int index, const wxBitmap &bitmap );
     bool Remove( int index );
     bool RemoveAll();
     bool Replace( int index, const wxBitmap &bitmap );
     bool Remove( int index );
     bool RemoveAll();

-    bool GetSize( int index, int &width, int &height ) const;
-    bool Draw(int index, wxDC& dc, int x, int y,
-      int flags = wxIMAGELIST_DRAW_NORMAL, bool solidBackground = FALSE );

 
 

-  private:
+    virtual bool Draw(int index, wxDC& dc, int x, int y,
+              int flags = wxIMAGELIST_DRAW_NORMAL,
+              bool solidBackground = FALSE);

 
 

+private:

     wxList  m_images;
     wxList  m_images;

+

     int     m_width;
     int     m_height;
     int     m_width;
     int     m_height;

+
+    DECLARE_DYNAMIC_CLASS(wxGenericImageList)
+};
+
+#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
+/*
+ * wxImageList has to be a real class or we have problems with
+ * the run-time information.
+ */
+
+class WXDLLEXPORT wxImageList: public wxGenericImageList
+{
+    DECLARE_DYNAMIC_CLASS(wxImageList)
+
+public:
+    wxImageList() {}
+
+    wxImageList( int width, int height, bool mask = TRUE, int initialCount = 1 )
+        : wxGenericImageList(width, height, mask, initialCount)
+    {
+    }

 };
 };

+#endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__

 
 #endif  // __IMAGELISTH_G__
 
 
 #endif  // __IMAGELISTH_G__