Fix for unhiding the other version of the base class HitTest

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index b6e68ef11e0c10ff682dc97e62034c6a57ac922e..692302e433a1b66940e81f63afceb34ae3ac54fb 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__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "imaglist.h"

 #endif
 
 #include "wx/defs.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,34 +36,75 @@
  * used.
  */
 
  * used.
  */
 

+#if !defined(wxIMAGELIST_DRAW_NORMAL)
+

 // Flags for Draw
 #define wxIMAGELIST_DRAW_NORMAL         0x0001
 #define wxIMAGELIST_DRAW_TRANSPARENT    0x0002
 #define wxIMAGELIST_DRAW_SELECTED       0x0004
 #define wxIMAGELIST_DRAW_FOCUSED        0x0008
 
 // Flags for Draw
 #define wxIMAGELIST_DRAW_NORMAL         0x0001
 #define wxIMAGELIST_DRAW_TRANSPARENT    0x0002
 #define wxIMAGELIST_DRAW_SELECTED       0x0004
 #define wxIMAGELIST_DRAW_FOCUSED        0x0008
 

-class wxImageList: public wxObject
+// Flag values for Set/GetImageList
+enum {
+    wxIMAGE_LIST_NORMAL, // Normal icons
+    wxIMAGE_LIST_SMALL,  // Small icons
+    wxIMAGE_LIST_STATE   // State icons: unimplemented (see WIN32 documentation)
+};
+
+#endif
+
+class WXDLLEXPORT wxGenericImageList: public wxObject

 {
 {

-   DECLARE_DYNAMIC_CLASS(wxImageList)
-   
-  public:
-
-    wxImageList(void);
-    ~wxImageList(void);
-    bool Create(void);
-    int GetImageCount(void) const;
-    int Add( const wxBitmap &bitmap );
-    bool Replace( const int index, const wxBitmap &bitmap );
-    bool Remove( const int index );
-    bool RemoveAll(void);
-    bool GetSize( const int index, int &width, int &height ) const;
-    bool Draw(const int index, wxDC& dc, const int x, const int y,
-      const int flags = wxIMAGELIST_DRAW_NORMAL, const bool solidBackground = FALSE );
-    
-  private:
+public:
+    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 );
+    bool Create();
+
+    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();

 
 

+    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;
+
+    DECLARE_DYNAMIC_CLASS(wxGenericImageList)
+};
+
+#if !defined(__WXMSW__) || 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__ || __WXUNIVERSAL__

 
 #endif  // __IMAGELISTH_G__
 
 
 #endif  // __IMAGELISTH_G__