first pass of wxUniv merge - nothing works, most parts don't even compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
parent aeb313f31c
commit 1e6feb95a7
409 changed files with 42065 additions and 6675 deletions
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -16,7 +16,6 @@

 #include "wx/setup.h"

-#if wxUSE_IMAGE && wxUSE_XPM

 class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxInputStream;
@@ -43,6 +42,5 @@ public:
 };


-#endif  // wxUSE_IMAGE && wxUSE_XPM
 #endif  // _WX_GIFDECOD_H_