mention wx[Flex]GridSizer too

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index c7dc1834fdb88877ebb7f8e5f2c46949e7538802..a68e54fa7dbf1e4e18c8b9bc21c7effa742771fb 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -242,9 +242,9 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
         // we assume that it is in XBM format which is not quite the same as
         // the format CreateBitmap() wants because the order of bytes in the
         // line is inversed!
         // we assume that it is in XBM format which is not quite the same as
         // the format CreateBitmap() wants because the order of bytes in the
         // line is inversed!

-        static const size_t bytesPerLine = (width + 7) / 8;
-        static const size_t padding = bytesPerLine % 2;
-        static const size_t len = height * ( padding + bytesPerLine );
+        const size_t bytesPerLine = (width + 7) / 8;
+        const size_t padding = bytesPerLine % 2;
+        const size_t len = height * ( padding + bytesPerLine );

         data = (char *)malloc(len);
         const char *src = bits;
         char *dst = data;
         data = (char *)malloc(len);
         const char *src = bits;
         char *dst = data;


@@ -297,15 +297,15 @@ bool wxBitmap::CreateFromXpm(const char **data)
     Init();
 
     wxCHECK_MSG( data != NULL, FALSE, wxT("invalid bitmap data") )
     Init();
 
     wxCHECK_MSG( data != NULL, FALSE, wxT("invalid bitmap data") )

-    
+

     wxXPMDecoder decoder;
     wxImage img = decoder.ReadData(data);
     wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
     wxXPMDecoder decoder;
     wxImage img = decoder.ReadData(data);
     wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )

-    
+

     *this = wxBitmap(img);
     return TRUE;
 #else
     *this = wxBitmap(img);
     return TRUE;
 #else

-       return FALSE;
+    return FALSE;

 #endif
 }
 
 #endif
 }
 


@@ -467,12 +467,14 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight );
     ::SelectObject( memdc, hbitmap);
 
     hbitmap = ::CreateCompatibleBitmap( hdc, width, bmpHeight );
     ::SelectObject( memdc, hbitmap);
 

+#if wxUSE_PALETTE

     HPALETTE hOldPalette = 0;
     if (image.GetPalette().Ok())
     {
         hOldPalette = ::SelectPalette(memdc, (HPALETTE) image.GetPalette().GetHPALETTE(), FALSE);
         ::RealizePalette(memdc);
     }
     HPALETTE hOldPalette = 0;
     if (image.GetPalette().Ok())
     {
         hOldPalette = ::SelectPalette(memdc, (HPALETTE) image.GetPalette().GetHPALETTE(), FALSE);
         ::RealizePalette(memdc);
     }

+#endif // wxUSE_PALETTE

 
     // copy image data into DIB data and then into DDB (in a loop)
     unsigned char *data = image.GetData();
 
     // copy image data into DIB data and then into DDB (in a loop)
     unsigned char *data = image.GetData();


@@ -523,8 +525,10 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     }
     SetHBITMAP( (WXHBITMAP) hbitmap );
 
     }
     SetHBITMAP( (WXHBITMAP) hbitmap );
 

+#if wxUSE_PALETTE

     if (hOldPalette)
         SelectPalette(memdc, hOldPalette, FALSE);
     if (hOldPalette)
         SelectPalette(memdc, hOldPalette, FALSE);

+#endif // wxUSE_PALETTE

 
     // similarly, created an mono-bitmap for the possible mask
     if( image.HasMask() )
 
     // similarly, created an mono-bitmap for the possible mask
     if( image.HasMask() )


@@ -792,7 +796,9 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
     return handler->Create(this, data, type, width, height, depth);
 }
 
     return handler->Create(this, data, type, width, height, depth);
 }
 

-bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette)
+bool wxBitmap::SaveFile(const wxString& filename,
+                        int type,
+                        const wxPalette *palette)

 {
     wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
 
 {
     wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
 


@@ -882,6 +888,8 @@ void wxBitmap::SetOk(bool isOk)
 }
 #endif // WXWIN_COMPATIBILITY_2
 
 }
 #endif // WXWIN_COMPATIBILITY_2
 

+#if wxUSE_PALETTE
+

 void wxBitmap::SetPalette(const wxPalette& palette)
 {
     EnsureHasData();
 void wxBitmap::SetPalette(const wxPalette& palette)
 {
     EnsureHasData();


@@ -889,6 +897,8 @@ void wxBitmap::SetPalette(const wxPalette& palette)
     GetBitmapData()->m_bitmapPalette = palette;
 }
 
     GetBitmapData()->m_bitmapPalette = palette;
 }
 

+#endif // wxUSE_PALETTE
+

 void wxBitmap::SetMask(wxMask *mask)
 {
     EnsureHasData();
 void wxBitmap::SetMask(wxMask *mask)
 {
     EnsureHasData();


@@ -911,6 +921,7 @@ wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
     LPBITMAPINFO    lpDib;
     void            *lpBits = (void*) NULL;
 
     LPBITMAPINFO    lpDib;
     void            *lpBits = (void*) NULL;
 

+#if wxUSE_PALETTE

     if( GetPalette() && GetPalette()->Ok() )
     {
         tmpBitmap.SetPalette(*GetPalette());
     if( GetPalette() && GetPalette()->Ok() )
     {
         tmpBitmap.SetPalette(*GetPalette());


@@ -927,6 +938,9 @@ wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
         memDC.SelectObject(tmpBitmap);
         memDC.SetPalette( palette );
     }
         memDC.SelectObject(tmpBitmap);
         memDC.SetPalette( palette );
     }

+#else // !wxUSE_PALETTE
+    hPal = (HPALETTE) ::GetStockObject(DEFAULT_PALETTE);
+#endif // wxUSE_PALETTE/!wxUSE_PALETTE

 
     // set the height negative because in a DIB the order of the lines is
     // reversed
 
     // set the height negative because in a DIB the order of the lines is
     // reversed


@@ -1032,6 +1046,8 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
         ::DeleteObject((HBITMAP) m_maskBitmap);
         m_maskBitmap = 0;
     }
         ::DeleteObject((HBITMAP) m_maskBitmap);
         m_maskBitmap = 0;
     }

+
+#if wxUSE_PALETTE

     if (bitmap.Ok() && bitmap.GetPalette()->Ok())
     {
         unsigned char red, green, blue;
     if (bitmap.Ok() && bitmap.GetPalette()->Ok())
     {
         unsigned char red, green, blue;


@@ -1041,6 +1057,8 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
             return Create(bitmap, transparentColour);
         }
     }
             return Create(bitmap, transparentColour);
         }
     }

+#endif // wxUSE_PALETTE
+

     return FALSE;
 }
 
     return FALSE;
 }