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/imagxpm.h
+++ b/include/wx/imagxpm.h
@@ -21,7 +21,6 @@
 // wxXPMHandler
 //-----------------------------------------------------------------------------

-#if wxUSE_XPM
 class WXDLLEXPORT wxXPMHandler : public wxImageHandler
 {
  DECLARE_DYNAMIC_CLASS(wxXPMHandler)
@@ -42,7 +41,6 @@ public:
  virtual bool DoCanRead( wxInputStream& stream );
 #endif
 };
-#endif // wxUSE_XPM


 #endif