Tidy up includes and #if wxUSE statements.

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

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index e4663a5b8ff983a0b52f84027c1c6233dee25bd3..96cdab77323f1e0cc7e8367252d806558544e8bc 100644 (file)
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -10,12 +10,9 @@
 #ifndef _WX_XPMDECOD_H_
 #define _WX_XPMDECOD_H_
 
 #ifndef _WX_XPMDECOD_H_
 #define _WX_XPMDECOD_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "xpmdecod.h"
-#endif
-

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

+#if wxUSE_IMAGE && wxUSE_XPM

 
 class WXDLLIMPEXP_CORE wxImage;
 class WXDLLIMPEXP_BASE wxInputStream;
 
 class WXDLLIMPEXP_CORE wxImage;
 class WXDLLIMPEXP_BASE wxInputStream;


@@ -38,9 +35,10 @@ public:
     wxImage ReadFile(wxInputStream& stream);
 #endif
     // Read directly from XPM data (as passed to wxBitmap ctor):
     wxImage ReadFile(wxInputStream& stream);
 #endif
     // Read directly from XPM data (as passed to wxBitmap ctor):

-    wxImage ReadData(const char **xpm_data);
+    wxImage ReadData(const char* const* xpm_data);

 };
 
 };
 

+#endif // wxUSE_IMAGE && wxUSE_XPM

 
 

-#endif  // _WX_GIFDECOD_H_
+#endif  // _WX_XPM_H_