Implemented Enable for wxMenuBar to avoid assert

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index bcf8a618f0778dddf32c50f90fb05b8fc6a6980f..37e69a0e5c995feb00b1d272cb520a75011d1d38 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -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);
 
     // 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;
     return TRUE;
 #else
     return FALSE;


@@ -279,13 +275,7 @@ bool wxBitmap::CopyFromCursor(const wxCursor& cursor)
     if ( !cursor.Ok() )
         return FALSE;
 
     if ( !cursor.Ok() )
         return FALSE;
 

-#ifdef __WIN16__
-    wxFAIL_MSG( _T("don't know how to convert cursor to bitmap") );
-
-    return FALSE;
-#else

     return CopyFromIconOrCursor(cursor);
     return CopyFromIconOrCursor(cursor);

-#endif // Win16

 }
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 }
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)


@@ -295,41 +285,7 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
     if ( !icon.Ok() )
         return FALSE;
 
     if ( !icon.Ok() )
         return FALSE;
 

-    // GetIconInfo() doesn't exist under Win16 and I don't know any other way
-    // to create a bitmap from icon there - but using this way we won't have
-    // the mask (FIXME)
-#ifdef __WIN16__
-    int width = icon.GetWidth(),
-        height = icon.GetHeight();
-
-    // copy the icon to the bitmap
-    ScreenHDC hdcScreen;
-    HDC hdc = ::CreateCompatibleDC(hdcScreen);
-    HBITMAP hbitmap = ::CreateCompatibleBitmap(hdcScreen, width, height);
-    HBITMAP hbmpOld = (HBITMAP)::SelectObject(hdc, hbitmap);
-
-    ::DrawIcon(hdc, 0, 0, GetHiconOf(icon));
-
-    ::SelectObject(hdc, hbmpOld);
-    ::DeleteDC(hdc);
-
-    wxBitmapRefData *refData = new wxBitmapRefData;
-    m_refData = refData;
-
-    refData->m_width = width;
-    refData->m_height = height;
-    refData->m_depth = wxDisplayDepth();
-
-    refData->m_hBitmap = (WXHBITMAP)hbitmap;
-
-#if WXWIN_COMPATIBILITY_2
-    refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
-
-    return TRUE;
-#else // Win32

     return CopyFromIconOrCursor(icon);
     return CopyFromIconOrCursor(icon);

-#endif // Win16/Win32

 }
 
 #if wxUSE_WXDIB
 }
 
 #if wxUSE_WXDIB


@@ -437,7 +393,11 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 }
 
 // Create from XPM data
 }
 
 // Create from XPM data

+#if wxUSE_IMAGE && wxUSE_XPM

 bool wxBitmap::CreateFromXpm(const char **data)
 bool wxBitmap::CreateFromXpm(const char **data)

+#else
+bool wxBitmap::CreateFromXpm(const char **WXUNUSED(data))
+#endif

 {
 #if wxUSE_IMAGE && wxUSE_XPM
     Init();
 {
 #if wxUSE_IMAGE && wxUSE_XPM
     Init();


@@ -528,10 +488,6 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
     else // create a DDB
 #endif
     {
     else // create a DDB
 #endif
     {

-        if ( d == -1 )
-            d = wxDisplayDepth();
-
-        GetBitmapData()->m_depth = d;

 
 #ifndef __WXMICROWIN__
         if ( d > 0 )
 
 #ifndef __WXMICROWIN__
         if ( d > 0 )


@@ -558,10 +514,6 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
 
     SetHBITMAP((WXHBITMAP)hbmp);
 
 
     SetHBITMAP((WXHBITMAP)hbmp);
 

-#if WXWIN_COMPATIBILITY_2
-    GetBitmapData()->m_ok = hbmp != 0;
-#endif // WXWIN_COMPATIBILITY_2
-

     return Ok();
 }
 
     return Ok();
 }
 


@@ -686,11 +638,6 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, const wxDC& dc)
     SetPalette(image.GetPalette());
 #endif // wxUSE_PALETTE
 
     SetPalette(image.GetPalette());
 #endif // wxUSE_PALETTE
 

-#if WXWIN_COMPATIBILITY_2
-    // check the wxBitmap object
-    GetBitmapData()->SetOk();
-#endif // WXWIN_COMPATIBILITY_2
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -825,10 +772,6 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc )
     // validate this object
     SetHBITMAP((WXHBITMAP)hbitmap);
 
     // 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() )
     {
     // finally also set the mask if we have one
     if ( image.HasMask() )
     {


@@ -1397,17 +1340,6 @@ void wxBitmap::SetMask(wxMask *mask)
     GetBitmapData()->SetMask(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))
 #if WXWIN_COMPATIBILITY_2_4
 
 void wxBitmap::SetQuality(int WXUNUSED(quality))


@@ -1542,20 +1474,20 @@ void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
             p = rowStart;
             p.OffsetY(data, 1);
         }
             p = rowStart;
             p.OffsetY(data, 1);
         }

+    }

 
 

-        // if we're a DDB we need to convert DIB back to DDB now to make the
-        // changes made via raw bitmap access effective
-        if ( !GetBitmapData()->m_isDIB )
-        {
-            wxDIB *dib = GetBitmapData()->m_dib;
-            GetBitmapData()->m_dib = NULL;
+    // if we're a DDB we need to convert DIB back to DDB now to make the
+    // changes made via raw bitmap access effective
+    if ( !GetBitmapData()->m_isDIB )
+    {
+        wxDIB *dib = GetBitmapData()->m_dib;
+        GetBitmapData()->m_dib = NULL;

 
 

-            // TODO: convert
+        // TODO: convert

 
 

-            delete dib;
-        }
+        delete dib;

     }
     }

-#endif
+#endif // wxUSE_WXDIB

 }
 #endif // #ifdef wxHAVE_RAW_BITMAP
 
 }
 #endif // #ifdef wxHAVE_RAW_BITMAP
 


@@ -1794,14 +1726,11 @@ bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
                  HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
 {
    unsigned long   i, headerSize;
                  HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
 {
    unsigned long   i, headerSize;

-   LPBITMAPINFO    lpDIBheader = NULL;
-   LPPALETTEENTRY  lpPe = NULL;
-

 
    // Allocate space for a DIB header
    headerSize = (sizeof(BITMAPINFOHEADER) + (256 * sizeof(PALETTEENTRY)));
 
    // Allocate space for a DIB header
    headerSize = (sizeof(BITMAPINFOHEADER) + (256 * sizeof(PALETTEENTRY)));

-   lpDIBheader = (BITMAPINFO *) malloc(headerSize);
-   lpPe = (PALETTEENTRY *)((BYTE*)lpDIBheader + sizeof(BITMAPINFOHEADER));
+   LPBITMAPINFO lpDIBheader = (BITMAPINFO *) malloc(headerSize);
+   LPPALETTEENTRY lpPe = (PALETTEENTRY *)((BYTE*)lpDIBheader + sizeof(BITMAPINFOHEADER));

 
    GetPaletteEntries(hPal, 0, 256, lpPe);
 
 
    GetPaletteEntries(hPal, 0, 256, lpPe);
 


@@ -1942,8 +1871,8 @@ HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
         wxLogLastError(wxT("CreateBitmap"));
     }
 
         wxLogLastError(wxT("CreateBitmap"));
     }
 

-    ::SelectObject(hdcSrc, hbmpMask);
-    ::SelectObject(hdcDst, hbmpInvMask);
+    HGDIOBJ srcTmp = ::SelectObject(hdcSrc, hbmpMask);
+    HGDIOBJ dstTmp = ::SelectObject(hdcDst, hbmpInvMask);

     if ( !::BitBlt(hdcDst, 0, 0, w, h,
                    hdcSrc, 0, 0,
                    NOTSRCCOPY) )
     if ( !::BitBlt(hdcDst, 0, 0, w, h,
                    hdcSrc, 0, 0,
                    NOTSRCCOPY) )


@@ -1951,6 +1880,10 @@ HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
         wxLogLastError(wxT("BitBlt"));
     }
 
         wxLogLastError(wxT("BitBlt"));
     }
 

+    // Deselect objects
+    SelectObject(hdcSrc,srcTmp);
+    SelectObject(hdcDst,dstTmp);
+    

     ::DeleteDC(hdcSrc);
     ::DeleteDC(hdcDst);
 
     ::DeleteDC(hdcSrc);
     ::DeleteDC(hdcDst);