use std::[w]string for wxString implementation unless wxUSE_STD_STRING==0 but even...

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index b04487f70e882a45a8dddbd3291d232f0054feb6..4d42a170d151a15db1460a6c7a432f3342021338 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -15,47 +15,17 @@
 #include "wx/list.h"
 #include "wx/icon.h"
 
 #include "wx/list.h"
 #include "wx/icon.h"
 

-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxColour;
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxColour;

 
 

-/*
- * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to
- * images for their items by an index into an image list.
- * A wxImageList is capable of creating images with optional masks from
- * a variety of sources - a single bitmap plus a colour to indicate the mask,
- * two bitmaps, or an icon.
- *
- * Image lists can also create and draw images used for drag and drop functionality.
- * This is not yet implemented in wxImageList. We need to discuss a generic API
- * for doing drag and drop and see whether it ties in with the Win95 view of it.
- * See below for candidate functions and an explanation of how they might be
- * 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

 
 

-// 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
+class WXDLLIMPEXP_CORE wxGenericImageList: public wxObject

 {
 public:
     wxGenericImageList() { m_width = m_height = 0; }
     wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 );
 {
 public:
     wxGenericImageList() { m_width = m_height = 0; }
     wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 );

-    ~wxGenericImageList();
+    virtual ~wxGenericImageList();

     bool Create( int width, int height, bool mask = true, int initialCount = 1 );
     bool Create();
 
     bool Create( int width, int height, bool mask = true, int initialCount = 1 );
     bool Create();
 


@@ -87,13 +57,14 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericImageList)
 };
 
     DECLARE_DYNAMIC_CLASS(wxGenericImageList)
 };
 

-#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
+#ifndef wxHAS_NATIVE_IMAGELIST
+

 /*
  * wxImageList has to be a real class or we have problems with
  * the run-time information.
  */
 
 /*
  * wxImageList has to be a real class or we have problems with
  * the run-time information.
  */
 

-class WXDLLEXPORT wxImageList: public wxGenericImageList
+class WXDLLIMPEXP_CORE wxImageList: public wxGenericImageList

 {
     DECLARE_DYNAMIC_CLASS(wxImageList)
 
 {
     DECLARE_DYNAMIC_CLASS(wxImageList)
 


@@ -105,7 +76,7 @@ public:
     {
     }
 };
     {
     }
 };

-#endif // !__WXMSW__ || __WXUNIVERSAL__
+#endif // !wxHAS_NATIVE_IMAGELIST

 
 #endif  // __IMAGELISTH_G__
 
 
 #endif  // __IMAGELISTH_G__