A few tweaks and cleanups

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

diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index d4357d63314a4487a1f6e9ade142bbd56b871d64..33c15169e256b4c9a0eb02df153e9faea4862e89 100644 (file)
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -30,9 +30,7 @@
 #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/os2/gdiimage.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/os2/gdiimage.h"
 
 // ----------------------------------------------------------------------------


@@ -199,8 +197,8 @@ private:
 #if !USE_SHARED_LIBRARIES
     IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
     IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
 #if !USE_SHARED_LIBRARIES
     IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
     IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)

-    IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxGDIImageHandler)
-    IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxGDIImageHandler)
+    IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -335,7 +333,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;
     }
 }


@@ -344,12 +344,6 @@ 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 wxICOResourceHandler);
     AddHandler(new wxICOFileHandler);
 }
     AddHandler(new wxICOResourceHandler);
     AddHandler(new wxICOFileHandler);
 }