fixed incorrect GetTextExtent for wxTELETYPE font

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

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index b93b3e23f564f8b61eeac2054017906ad2b782e2..2d7a3fc799f6a204147935360603498f455577b3 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -9,6 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef __GNUG__
+    #pragma implementation "bitmap.h"
+#endif
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -127,10 +131,6 @@ bool wxBitmap::CopyFromIcon(
     if (!rIcon.Ok())
         return(FALSE);
 
-#if WXWIN_COMPATIBILITY_2
-    refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
-
     return CopyFromIconOrCursor(rIcon);
 }
 
@@ -340,7 +340,7 @@ bool wxBitmap::LoadFile(
 , long                              lType
 )
 {
-    HPS                             hPs;
+    HPS                             hPs = NULLHANDLE;
 
     UnRef();