mention wx[Flex]GridSizer too

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

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 5a9017faf0a4391c03bec5a7d3e37f53d7b8afbf..f5b86d7c2b7d740a658ad60c7654894eb724aa4a 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -708,12 +708,14 @@ bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette **pal)
 
   if (hPalette)
   {
 
   if (hPalette)
   {

+#if wxUSE_PALETTE

     if (pal)
     {
       *pal = new wxPalette;
       (*pal)->SetHPALETTE((WXHPALETTE) hPalette);
     }
     else
     if (pal)
     {
       *pal = new wxPalette;
       (*pal)->SetHPALETTE((WXHPALETTE) hPalette);
     }
     else

+#endif // wxUSE_PALETTE

       DeleteObject(hPalette);
   }
   else if (pal)
       DeleteObject(hPalette);
   }
   else if (pal)


@@ -928,8 +930,10 @@ HANDLE wxBitmapToDIB (HBITMAP hBitmap, HPALETTE hPal)
 bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette *colourmap)
 {
   HPALETTE hPalette = 0;
 bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette *colourmap)
 {
   HPALETTE hPalette = 0;

+#if wxUSE_PALETTE

   if (colourmap)
     hPalette = (HPALETTE) colourmap->GetHPALETTE();
   if (colourmap)
     hPalette = (HPALETTE) colourmap->GetHPALETTE();

+#endif // wxUSE_PALETTE

 
   HANDLE dibHandle = wxBitmapToDIB((HBITMAP) bitmap->GetHBITMAP(), hPalette);
   if (dibHandle)
 
   HANDLE dibHandle = wxBitmapToDIB((HBITMAP) bitmap->GetHBITMAP(), hPalette);
   if (dibHandle)


@@ -941,4 +945,3 @@ bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette *colourmap)
   else return FALSE;
 }
 
   else return FALSE;
 }
 

-