Mutiple updates from SciTech for wxWindows including the following:

1. Updates to HTML applet classes in client side include syntax
2. Updates to wxUniversal for OS/2
3. Updates for better palette management on Windows
4. Misc other fixes and changes to fix build system for Watcom 11.0


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/os2/gdiimage.cpp

@@ -346,8 +346,10 @@ void wxGDIImage::InitStandardHandlers()
     AddHandler(new wxBMPResourceHandler);
     AddHandler(new wxBMPFileHandler);
 
+#if wxUSE_XPM_IN_OS2
     AddHandler(new wxXPMFileHandler);
     AddHandler(new wxXPMDataHandler);
+#endif
 
     AddHandler(new wxICOResourceHandler);
     AddHandler(new wxICOFileHandler);