Merge in from trunk r67662 to r64801

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

diff --git a/src/palmos/imaglist.cpp b/src/palmos/imaglist.cpp
index 44bf917c7946a8e593d9017458383af0d619dc8b..c683b43e81bac880ed91b4798a329650186acf50 100644 (file)
--- a/src/palmos/imaglist.cpp
+++ b/src/palmos/imaglist.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/imaglist.cpp
 // Purpose:     wxImageList implementation for Palm OS
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "imaglist.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -34,14 +30,11 @@
     #include "wx/dc.h"
     #include "wx/string.h"
     #include "wx/dcmemory.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
 #endif
 
-#include "wx/log.h"
-#include "wx/intl.h"
-
-#include "wx/palmos/imaglist.h"
-#include "wx/palmos/private.h"
-
+#include "wx/imaglist.h"
 
 // ----------------------------------------------------------------------------
 // wxWin macros
@@ -96,7 +89,7 @@ bool wxImageList::GetSize(int WXUNUSED(index), int &width, int &height) const
 // ----------------------------------------------------------------------------
 
 int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
-
+{
     return 0;
 }
 
@@ -139,4 +132,3 @@ bool wxImageList::Draw(int index,
 {
     return false;
 }
-