X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4676948b6814c97b93c431a8cbcd8c0352c87ba9..789f8e6ad40488d2dd5f5f4d87e195d0f1e23422:/src/msw/bitmap.cpp

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 650e66e27e..0e5ab48c9f 100644
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "bitmap.h"
 #endif
 
@@ -260,10 +260,6 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
     // delete the old one now as we don't need it any more
     ::DeleteObject(iconInfo.hbmMask);
 
-#if WXWIN_COMPATIBILITY_2
-    refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
-
     return TRUE;
 #else
     return FALSE;
@@ -322,10 +318,6 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 
     refData->m_hBitmap = (WXHBITMAP)hbitmap;
 
-#if WXWIN_COMPATIBILITY_2
-    refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
-
     return TRUE;
 #else // Win32
     return CopyFromIconOrCursor(icon);
@@ -506,6 +498,7 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
 
     HBITMAP hbmp;
 
+#if wxUSE_WXDIB
     if ( wxShouldCreateDIB(w, h, d, hdc) )
     {
         if ( d == -1 )
@@ -525,6 +518,7 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
         GetBitmapData()->m_depth = d;
     }
     else // create a DDB
+#endif
     {
         if ( d == -1 )
             d = wxDisplayDepth();
@@ -556,10 +550,6 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
 
     SetHBITMAP((WXHBITMAP)hbmp);
 
-#if WXWIN_COMPATIBILITY_2
-    GetBitmapData()->m_ok = hbmp != 0;
-#endif // WXWIN_COMPATIBILITY_2
-
     return Ok();
 }
 
@@ -684,11 +674,6 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, const wxDC& dc)
     SetPalette(image.GetPalette());
 #endif // wxUSE_PALETTE
 
-#if WXWIN_COMPATIBILITY_2
-    // check the wxBitmap object
-    GetBitmapData()->SetOk();
-#endif // WXWIN_COMPATIBILITY_2
-
     return TRUE;
 }
 
@@ -776,6 +761,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
 
 bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc )
 {
+#if wxUSE_WXDIB
     wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") );
 
     UnRef();
@@ -822,10 +808,6 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc )
     // validate this object
     SetHBITMAP((WXHBITMAP)hbitmap);
 
-#if WXWIN_COMPATIBILITY_2
-    m_refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
-
     // finally also set the mask if we have one
     if ( image.HasMask() )
     {
@@ -835,6 +817,10 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc )
     }
 
     return TRUE;
+#else
+    // FIXME: wxWinCE doesn't support wxDIB yet
+    return FALSE;
+#endif
 }
 
 wxImage wxBitmap::ConvertToImage() const
@@ -1390,17 +1376,6 @@ void wxBitmap::SetMask(wxMask *mask)
     GetBitmapData()->SetMask(mask);
 }
 
-#if WXWIN_COMPATIBILITY_2
-
-void wxBitmap::SetOk(bool isOk)
-{
-    EnsureHasData();
-
-    GetBitmapData()->m_ok = isOk;
-}
-
-#endif // WXWIN_COMPATIBILITY_2
-
 #if WXWIN_COMPATIBILITY_2_4
 
 void wxBitmap::SetQuality(int WXUNUSED(quality))
@@ -1858,6 +1833,7 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
     }
 
     ICONINFO iconInfo;
+    wxZeroMemory(iconInfo);
     iconInfo.fIcon = iconWanted;  // do we want an icon or a cursor?
     if ( !iconWanted )
     {