wxMSW and wxPalmOS already had the wxFont(const wxSize&...) ctor; don't duplicate it

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

diff --git a/include/wx/palmos/imaglist.h b/include/wx/palmos/imaglist.h
index fc79c029d22b5d444b5438ebc6c5fa8c989f7760..7f910d68d9dcbf110c923425d707259e687cbacf 100644 (file)
--- a/include/wx/palmos/imaglist.h
+++ b/include/wx/palmos/imaglist.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/imaglist.h
 // Purpose:     wxImageList class
-// Author:      William Osborne
-// Modified by:
+// Author:      William Osborne - minimal working wxPalmOS port
+// Modified by: Yunhui Fu
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,10 +12,6 @@
 #ifndef _WX_IMAGLIST_H_
 #define _WX_IMAGLIST_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "imaglist.h"
-#endif
-
 #include "wx/bitmap.h"
 
 /*
@@ -32,24 +28,11 @@
  * used.
  */
 
-// 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)
-};
-
 // Eventually we'll make this a reference-counted wxGDIObject. For
 // now, the app must take care of ownership issues. That is, the
 // image lists must be explicitly deleted after the control(s) that uses them
 // is (are) deleted, or when the app exits.
-class WXDLLEXPORT wxImageList : public wxObject
+class WXDLLIMPEXP_CORE wxImageList : public wxObject
 {
 public:
   /*
@@ -66,7 +49,7 @@ public:
   {
     Create(width, height, mask, initialCount);
   }
-  ~wxImageList();
+  virtual ~wxImageList();
 
 
   // Attributes