diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index a453f8b02d..b64b64e50b 100644
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -287,7 +287,7 @@ extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message
 // OS/2 convention of the mask is opposed to the wxWidgets one, so we need
 // to invert the mask each time we pass one/get one to/from Windows
 extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0);
-extern HBITMAP wxFlipBmp(HBITMAP hbmp, int w = 0, int h = 0);
+extern HBITMAP wxCopyBmp(HBITMAP hbmp, bool flip=false, int w=0, int h=0);
 
 // ---------------------------------------------------------------------------
 // global data
diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 899777b119..068ccb0294 100644
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -67,8 +67,7 @@ wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy)
     if (tocopy.m_pBitmapMask)
         m_pBitmapMask = new wxMask(*tocopy.m_pBitmapMask);
 
-    // TODO: how to copy an HBITMAP?
-    m_hBitmap       = tocopy.m_hBitmap;
+    m_hBitmap = wxCopyBmp(tocopy.m_hBitmap);
 }
 
 void wxBitmapRefData::Free()
@@ -1222,8 +1221,7 @@ wxMask::wxMask()
 
 wxMask::wxMask(const wxMask& tocopy)
 {
-    // TODO: how to copy a WXHBITMAP?
-    m_hMaskBitmap = tocopy.m_hMaskBitmap;
+    m_hMaskBitmap = wxCopyBmp(tocopy.m_hMaskBitmap);
 } // end of wxMask::wxMask
 
 // Construct a mask from a bitmap and a colour indicating
@@ -1628,9 +1626,9 @@ HBITMAP wxInvertMask(
     return hBmpInvMask;
 } // end of WxWinGdi_InvertMask
 
-HBITMAP wxFlipBmp( HBITMAP hBmp, int nWidth, int nHeight )
+HBITMAP wxCopyBmp( HBITMAP hBmp, bool flip, int nWidth, int nHeight )
 {
-    wxCHECK_MSG( hBmp, 0, _T("invalid bitmap in wxFlipBmp") );
+    wxCHECK_MSG( hBmp, 0, _T("invalid bitmap in wxCopyBmp") );
 
     //
     // Get width/height from the bitmap if not given
@@ -1673,7 +1671,11 @@ HBITMAP wxFlipBmp( HBITMAP hBmp, int nWidth, int nHeight )
                                     {nWidth, 0},
                                     {0,      0},
                                     {nWidth, nHeight} };
-
+    if (!flip)
+    {
+        vPoint[0].y = 0;
+        vPoint[1].y = nHeight;
+    }
     memset(&vBmih, '\0', 16);
     vBmih.cbFix     = 16;
     vBmih.cx        = nWidth;
diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp
index e0051d4fd4..07fda9543e 100644
--- a/src/os2/notebook.cpp
+++ b/src/os2/notebook.cpp
@@ -337,7 +337,7 @@ bool wxNotebook::SetPageImage (
     return (bool)::WinSendMsg( GetHWND()
                               ,BKM_SETTABBITMAP
                               ,MPFROMLONG((ULONG)m_alPageId[nPage])
-                              ,(MPARAM)wxFlipBmp(vBitmap.GetHBITMAP())
+                              ,(MPARAM)wxCopyBmp(vBitmap.GetHBITMAP(), true)
                              );
 } // end of wxNotebook::SetPageImage