More SC++ fixes; HelpGen starting to compile with VC++; image sample now compiles...

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 6949e0783aa0030bda359b704123c7a66de06193..e935db2c76130189a146f2786bc5b3319efa07e6 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -27,6 +27,7 @@
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/palette.h"
+#include "wx/dcmemory.h"
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #endif
@@ -78,6 +79,7 @@ wxBitmapRefData::~wxBitmapRefData(void)
   if (m_bitmapMask)
     delete m_bitmapMask;
   m_bitmapMask = NULL;
+
 }
 
 wxList wxBitmap::sm_handlers;
@@ -405,9 +407,9 @@ wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
 */
     if( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) )
     {
-        tmpBitmap.SetPalette(this->GetPalette());
+        tmpBitmap.SetPalette(* this->GetPalette());
         memDC.SelectObject(tmpBitmap);
-        memDC.SetPalette(this->GetPalette());
+        memDC.SetPalette(* this->GetPalette());
         hPal = (HPALETTE) this->GetPalette()->GetHPALETTE();
     }
     else