popup activation scope and l&f

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

diff --git a/include/wx/palmos/imaglist.h b/include/wx/palmos/imaglist.h
index c4ed8b7d339ba68c003ce27fc71e71457a88a8e6..5b1cc588ce2ac65c137717357a5203c728800502 100644 (file)
--- a/include/wx/palmos/imaglist.h
+++ b/include/wx/palmos/imaglist.h
@@ -2,7 +2,7 @@
 // Name:        wx/palmos/imaglist.h
 // Purpose:     wxImageList class
 // Author:      William Osborne - minimal working wxPalmOS port
 // Name:        wx/palmos/imaglist.h
 // Purpose:     wxImageList class
 // Author:      William Osborne - minimal working wxPalmOS port

-// Modified by:
+// Modified by: Yunhui Fu

 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Copyright:   (c) William Osborne


@@ -12,10 +12,6 @@
 #ifndef _WX_IMAGLIST_H_
 #define _WX_IMAGLIST_H_
 
 #ifndef _WX_IMAGLIST_H_
 #define _WX_IMAGLIST_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "imaglist.h"
-#endif
-

 #include "wx/bitmap.h"
 
 /*
 #include "wx/bitmap.h"
 
 /*


@@ -32,19 +28,6 @@
  * used.
  */
 
  * 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
 // 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


@@ -66,7 +49,7 @@ public:
   {
     Create(width, height, mask, initialCount);
   }
   {
     Create(width, height, mask, initialCount);
   }

-  ~wxImageList();
+  virtual ~wxImageList();

 
 
   // Attributes
 
 
   // Attributes