added common regex

[wxWidgets.git] / src / os2 / gdiimage.cpp

diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index d4357d63314a4487a1f6e9ade142bbd56b871d64..8c1fe4a289b3ef9205ee4ac1b1aa735c5fb048e6 100644 (file)
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -30,9 +30,8 @@
 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"
 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"

-

 #include "wx/app.h"
 #include "wx/app.h"

-
+#include "wx/xpmhand.h"

 #include "wx/os2/gdiimage.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/os2/gdiimage.h"
 
 // ----------------------------------------------------------------------------


@@ -335,7 +334,9 @@ void wxGDIImage::CleanUpHandlers()
         wxNode*                     pNext    = pNode->Next();
 
         delete pHandler;
         wxNode*                     pNext    = pNode->Next();
 
         delete pHandler;

+#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )))

         delete pNode;
         delete pNode;

+#endif

         pNode = pNext;
     }
 }
         pNode = pNext;
     }
 }


@@ -345,10 +346,8 @@ void wxGDIImage::InitStandardHandlers()
     AddHandler(new wxBMPResourceHandler);
     AddHandler(new wxBMPFileHandler);
 
     AddHandler(new wxBMPResourceHandler);
     AddHandler(new wxBMPFileHandler);
 

-    // Not added by default: include xpmhand.h in your app
-    // and call these in your wxApp::OnInit.
-    //  AddHandler(new wxXPMFileHandler);
-    //  AddHandler(new wxXPMDataHandler);
+    AddHandler(new wxXPMFileHandler);
+    AddHandler(new wxXPMDataHandler);

 
     AddHandler(new wxICOResourceHandler);
     AddHandler(new wxICOFileHandler);
 
     AddHandler(new wxICOResourceHandler);
     AddHandler(new wxICOFileHandler);