Fix recreating of wxBitmapComboBox using untyped client data.

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

diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp
index 9ab06acf96f586e6413bc060a003c7dd6d503613..beea68483cb3b21e0aa2731d78632a33d1e4bc18 100644 (file)
--- a/src/os2/utilsgui.cpp
+++ b/src/os2/utilsgui.cpp
@@ -4,7 +4,6 @@
 // Author:      David Webster
 // Modified by:
 // Created:     20.08.2003 (extracted from os2/utils.cpp)
 // Author:      David Webster
 // Modified by:
 // Created:     20.08.2003 (extracted from os2/utils.cpp)

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -42,6 +41,12 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+// Emit a beeeeeep
+void wxBell()
+{
+    DosBeep(1000,1000); // 1kHz during 1 sec.
+}
+

 // ----------------------------------------------------------------------------
 // functions to work with .INI files
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // functions to work with .INI files
 // ----------------------------------------------------------------------------


@@ -859,7 +864,7 @@ wxBitmap wxDisableBitmap(
     ::GpiSetBitmap(hPS, NULLHANDLE);
     ::GpiDestroyPS(hPS);
     ::DevCloseDC(hDC);
     ::GpiSetBitmap(hPS, NULLHANDLE);
     ::GpiDestroyPS(hPS);
     ::DevCloseDC(hDC);

-    if (vNewBmp.Ok())
+    if (vNewBmp.IsOk())

         return(vNewBmp);
     return(wxNullBitmap);
 } // end of wxDisableBitmap
         return(vNewBmp);
     return(wxNullBitmap);
 } // end of wxDisableBitmap