XPM updates

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

diff --git a/include/wx/os2/xpmhand.h b/include/wx/os2/xpmhand.h
index 662f954da6f699b6b2217a377a48826f2bfa11e2..c83fcde5e16d78c2f612aa92f25b924a7c352204 100644 (file)
--- a/include/wx/os2/xpmhand.h
+++ b/include/wx/os2/xpmhand.h
@@ -38,6 +38,18 @@ public:
                           ,int              nType
                           ,const wxPalette* pPalette = NULL
                          );
                           ,int              nType
                           ,const wxPalette* pPalette = NULL
                          );

+private:
+    inline bool LoadFile( wxBitmap*       pBitmap
+                         ,const wxString& rsName
+                         ,HPS             hPs
+                         ,long            lFlags
+                         ,int             nDesiredWidth
+                         ,int             nDesiredHeight
+                        )
+    {
+        return(wxBitmapHandler::LoadFile(pBitmap, rsName, hPs, lFlags, nDesiredWidth, nDesiredHeight));
+    }
+

 }; // end of CLASS wxWPMFileHandler
 
 class WXDLLEXPORT wxXPMDataHandler: public wxBitmapHandler
 }; // end of CLASS wxWPMFileHandler
 
 class WXDLLEXPORT wxXPMDataHandler: public wxBitmapHandler


@@ -57,6 +69,18 @@ public:
                         ,int       lHeight
                         ,int       lDepth = 1
                        );
                         ,int       lHeight
                         ,int       lDepth = 1
                        );

+private:
+    bool Create( wxGDIImage* pImage
+                ,void*       pData
+                ,long        lFlags
+                ,int         nWidth
+                ,int         nHeight
+                ,int         nDepth = 1
+               )
+    {
+        return(wxBitmapHandler::Create(pImage, pData, lFlags, nWidth, nHeight, nDepth));
+    }
+

 }; // end of wxXPMDataHandler
 
 #endif
 }; // end of wxXPMDataHandler
 
 #endif