compilation fix for wxString::Format("no variadic arguments") and VC6

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

diff --git a/include/wx/xpmhand.h b/include/wx/xpmhand.h
index 9a848a0f8ccde1af422a241573454bb99eec6ebd..17139965a1b2f8c225852bc6e181be4e4f1f2e7b 100644 (file)
--- a/include/wx/xpmhand.h
+++ b/include/wx/xpmhand.h
@@ -1,10 +1,24 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/xpmhand.h
+// Purpose:     XPM handler base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #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__)
-#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