removed src/gtk/eggtrayicon.h

[wxWidgets.git] / src / generic / imaglist.cpp

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 15ec2cc5e165d159a7e90993b86561d65b3cb96a..8c7f6898d3e55f4da6fd4fbbc20842163fc0b8a0 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -7,7 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#ifndef __PALMOS__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "imaglist.h"
 #endif
 
 #pragma implementation "imaglist.h"
 #endif
 


@@ -29,7 +31,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)
 

-#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)

 /*
  * 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.


@@ -45,6 +47,7 @@ wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int in
 
 wxGenericImageList::~wxGenericImageList()
 {
 
 wxGenericImageList::~wxGenericImageList()
 {

+    (void)RemoveAll();

 }
 
 int wxGenericImageList::GetImageCount() const
 }
 
 int wxGenericImageList::GetImageCount() const


@@ -62,7 +65,7 @@ bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int
 
 bool wxGenericImageList::Create()
 {
 
 bool wxGenericImageList::Create()
 {

-    return TRUE;
+    return true;

 }
 
 int wxGenericImageList::Add( const wxBitmap &bitmap )
 }
 
 int wxGenericImageList::Add( const wxBitmap &bitmap )


@@ -107,19 +110,17 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
 {
     wxList::compatibility_iterator node = m_images.Item( index );
 
 {
     wxList::compatibility_iterator node = m_images.Item( index );
 

-    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );

 
 

-    wxBitmap* newBitmap = NULL;
-    if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
-#if defined(__VISAGECPP__)
-//just can't do this in VisualAge now, with all this new Bitmap-Icon stuff
-//so construct it from a bitmap object until I can figure this nonsense out. (DW)
-        newBitmap = new wxBitmap(bitmap) ;
-#else
-        newBitmap = new wxBitmap( (const wxIcon&) bitmap );
-#endif
-    else
-        newBitmap = new wxBitmap(bitmap) ;
+    wxBitmap* newBitmap = (bitmap.IsKindOf(CLASSINFO(wxIcon))) ?
+                             #if defined(__VISAGECPP__)
+                               //just can't do this in VisualAge now, with all this new Bitmap-Icon stuff
+                               //so construct it from a bitmap object until I can figure this nonsense out. (DW)
+                               new wxBitmap(bitmap)
+                             #else
+                               new wxBitmap( (const wxIcon&) bitmap )
+                             #endif
+                               : new wxBitmap(bitmap) ;

 
     if (index == (int) m_images.GetCount() - 1)
     {
 
     if (index == (int) m_images.GetCount() - 1)
     {


@@ -135,19 +136,19 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
         m_images.Insert( next, newBitmap );
     }
 
         m_images.Insert( next, newBitmap );
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericImageList::Remove( int index )
 {
     wxList::compatibility_iterator node = m_images.Item( index );
 
 }
 
 bool wxGenericImageList::Remove( int index )
 {
     wxList::compatibility_iterator node = m_images.Item( index );
 

-    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );

 
     delete node->GetData();
     m_images.Erase( node );
 
 
     delete node->GetData();
     m_images.Erase( node );
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericImageList::RemoveAll()
 }
 
 bool wxGenericImageList::RemoveAll()


@@ -155,7 +156,7 @@ bool wxGenericImageList::RemoveAll()
     WX_CLEAR_LIST(wxList, m_images);
     m_images.Clear();
 
     WX_CLEAR_LIST(wxList, m_images);
     m_images.Clear();
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericImageList::GetSize( int index, int &width, int &height ) const
 }
 
 bool wxGenericImageList::GetSize( int index, int &width, int &height ) const


@@ -165,13 +166,13 @@ bool wxGenericImageList::GetSize( int index, int &width, int &height ) const
 
     wxList::compatibility_iterator node = m_images.Item( index );
 
 
     wxList::compatibility_iterator node = m_images.Item( index );
 

-    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );

 
     wxBitmap *bm = (wxBitmap*)node->GetData();
     width = bm->GetWidth();
     height = bm->GetHeight();
 
 
     wxBitmap *bm = (wxBitmap*)node->GetData();
     width = bm->GetWidth();
     height = bm->GetHeight();
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
 }
 
 bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,


@@ -179,7 +180,7 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
 {
     wxList::compatibility_iterator node = m_images.Item( index );
 
 {
     wxList::compatibility_iterator node = m_images.Item( index );
 

-    wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );

 
     wxBitmap *bm = (wxBitmap*)node->GetData();
 
 
     wxBitmap *bm = (wxBitmap*)node->GetData();
 


@@ -188,7 +189,7 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
     else
         dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
 
     else
         dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
 

-    return TRUE;
+    return true;

 }
 
 }
 

-
+#endif // __PALMOS__