OS/2 updates to catch the port up with the rest of the library.

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

include/wx/os2/checklst.h

@@ -80,19 +80,6 @@ protected:
 private:
     size_t                          m_nItemHeight;  // height of checklistbox items (the same for all)
 
-    //
-    // Virtual function hiding suppression, do not use
-    //
-    virtual wxControl* CreateItem( const wxItemResource*  pChildResource
-                                  ,const wxItemResource*  pParentResource
-                                  ,const wxResourceTable* pTable = (const wxResourceTable *) NULL
-                                 )
-    {
-        return(wxWindowBase::CreateItem( pChildResource
-                                        ,pParentResource
-                                        ,pTable
-                                       ));
-    }
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
     DECLARE_EVENT_TABLE()
 }; // end of CLASS wxCheckListBoxItem

include/wx/os2/listbox.h

@@ -145,21 +145,6 @@ protected:
 #endif
 
 private:
-#if wxUSE_WX_RESOURCES
-#  if wxUSE_OWNER_DRAWN
-    virtual wxControl*    CreateItem( const wxItemResource*  pChildResource
-                                     ,const wxItemResource*  pParentResource
-                                     ,const wxResourceTable* pTable = (const wxResourceTable *) NULL
-                                    )
-    {
-        return(wxWindowBase::CreateItem( pChildResource
-                                        ,pParentResource
-                                        ,pTable
-                                       )
-              );
-    }
-#  endif
-#endif
     DECLARE_DYNAMIC_CLASS(wxListBox)
 }; // end of wxListBox
 

include/wx/os2/region.h

@@ -170,6 +170,22 @@ public:
     wxRegionContain Contains( wxCoord lX
                              ,wxCoord lY
                             ) const;
+
+    //
+    // Convert the region to a B&W bitmap with the black pixels being inside
+    // the region.
+    //
+    wxBitmap        ConvertToBitmap(void) const;
+
+    // Use the non-transparent pixels of a wxBitmap for the region to combine
+    // with this region.  If the bitmap has a mask then it will be used,
+    // otherwise the colour to be treated as transparent may be specified,
+    // along with an optional tolerance value.
+    bool            Union( const wxBitmap& rBmp
+                          ,const wxColour& rTransColour = wxNullColour
+                          ,int   nTolerance = 0
+                         );
+
     //
     // Does the region contain the point pt?
     //

include/wx/os2/setup0.h

@@ -143,7 +143,7 @@
 #define wxUSE_RESOURCE_LOADING_IN_OS2     1
                                     // Use dynamic icon/cursor loading/saving code
                                     // under OS2.
-#define wxUSE_WX_RESOURCES        1
+#define wxUSE_WX_RESOURCES        0
                                   // Use .wxr resource mechanism (requires PrologIO library)
 
 // support for startup tips (wxShowTip &c)

include/wx/os2/toolbar.h

@@ -205,6 +205,15 @@ private:
     wxCoord                         m_vXMouse;
     wxCoord                         m_vYMouse;
 
+    //
+    // Virtual function hiding supression
+    virtual wxToolBarToolBase *InsertTool (size_t nPos, wxToolBarToolBase* pTool)
+    {
+        return( wxToolBarBase::InsertTool( nPos
+                                          ,pTool
+                                         ));
+    }
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };