Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

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

diff --git a/include/wx/xpmhand.h b/include/wx/xpmhand.h
index 9a848a0f8ccde1af422a241573454bb99eec6ebd..80105ed80edde6f752c21b7c67d04ad3b0c06fd0 100644 (file)
--- a/include/wx/xpmhand.h
+++ b/include/wx/xpmhand.h
@@ -1,10 +1,13 @@
 #ifndef _WX_XPMHAND_H_BASE_
 #define _WX_XPMHAND_H_BASE_
 
 #ifndef _WX_XPMHAND_H_BASE_
 #define _WX_XPMHAND_H_BASE_
 

-// Only wxMSW currently defines a separate XPM handler, since
-// mostly Windows apps won't need XPMs.
+// Only wxMSW and wxPM currently defines a separate XPM handler, since
+// mostly Windows and Presentation Manager apps won't need XPMs.

 #if defined(__WXMSW__)
 #if defined(__WXMSW__)

-#include "wx/msw/xpmhand.h"
+#error xpmhand.h is no longer needed since wxImage now handles XPMs.
+#endif
+#if defined(__WXPM__)
+#include "wx/os2/xpmhand.h"

 #endif
 
 #endif
 #endif
 
 #endif