oops, removed duplicate SetIcons[s]() added in last commit

[wxWidgets.git] / include / wx / dcmemory.h

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index 0716eab54ae9c08aa0972b9b5b47e87ca217e935..80d3c7f5debc68700a549b2b55d7544716e153ee 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -1,20 +1,24 @@
 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_
 
 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_
 

-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+#include "wx/palmos/dcmemory.h"
+#elif defined(__WXMSW__)

 #include "wx/msw/dcmemory.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/dcmemory.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcmemory.h"
 #include "wx/msw/dcmemory.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/dcmemory.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcmemory.h"

+#elif defined(__WXX11__)
+#include "wx/x11/dcmemory.h"

 #elif defined(__WXMGL__)
 #include "wx/mgl/dcmemory.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcmemory.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/dcmemory.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcmemory.h"

+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/dcmemory.h"

 #elif defined(__WXPM__)
 #include "wx/os2/dcmemory.h"
 #elif defined(__WXPM__)
 #include "wx/os2/dcmemory.h"

-#elif defined(__WXSTUBS__)
-#include "wx/stubs/dcmemory.h"

 #endif
 
 #endif
 #endif
 
 #endif