Dialog Editor corrections for latest wxWin changes; removed wxProp files

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 6949e0783aa0030bda359b704123c7a66de06193..264bb3359e3953ae174108137812f7c38ca54d6c 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -78,6 +78,7 @@ wxBitmapRefData::~wxBitmapRefData(void)
   if (m_bitmapMask)
     delete m_bitmapMask;
   m_bitmapMask = NULL;
   if (m_bitmapMask)
     delete m_bitmapMask;
   m_bitmapMask = NULL;

+

 }
 
 wxList wxBitmap::sm_handlers;
 }
 
 wxList wxBitmap::sm_handlers;


@@ -405,9 +406,9 @@ wxBitmap wxBitmap::GetBitmapForDC(wxDC& dc) const
 */
     if( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) )
     {
 */
     if( this->GetPalette() && this->GetPalette()->Ok() && (this->GetPalette()->GetHPALETTE() != 0) )
     {

-        tmpBitmap.SetPalette(this->GetPalette());
+        tmpBitmap.SetPalette(* this->GetPalette());

         memDC.SelectObject(tmpBitmap);
         memDC.SelectObject(tmpBitmap);

-        memDC.SetPalette(this->GetPalette());
+        memDC.SetPalette(* this->GetPalette());

         hPal = (HPALETTE) this->GetPalette()->GetHPALETTE();
     }
     else
         hPal = (HPALETTE) this->GetPalette()->GetHPALETTE();
     }
     else