Always link with expat in monolithic build.

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

diff --git a/src/palmos/imaglist.cpp b/src/palmos/imaglist.cpp
index d07ac4bf6799146e03cbdedcde9ce218bef3dfb5..c683b43e81bac880ed91b4798a329650186acf50 100644 (file)
--- a/src/palmos/imaglist.cpp
+++ b/src/palmos/imaglist.cpp
@@ -30,14 +30,11 @@
     #include "wx/dc.h"
     #include "wx/string.h"
     #include "wx/dcmemory.h"
     #include "wx/dc.h"
     #include "wx/string.h"
     #include "wx/dcmemory.h"

+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #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
 
 // ----------------------------------------------------------------------------
 // wxWin macros


@@ -92,7 +89,7 @@ bool wxImageList::GetSize(int WXUNUSED(index), int &width, int &height) const
 // ----------------------------------------------------------------------------
 
 int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
 // ----------------------------------------------------------------------------
 
 int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)

-
+{

     return 0;
 }
 
     return 0;
 }
 


@@ -135,4 +132,3 @@ bool wxImageList::Draw(int index,
 {
     return false;
 }
 {
     return false;
 }

-