Fix release build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index d0038118cb0c86dcd6b5b7f8dffdb8549a63213e..9be4159f4833641d2293749155477b578b95d3d0 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -128,7 +128,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 
 wxBitmapRefData::wxBitmapRefData()
 {
 
 wxBitmapRefData::wxBitmapRefData()
 {

+#ifdef __WXDEBUG__

     m_selectedInto = NULL;
     m_selectedInto = NULL;

+#endif

     m_bitmapMask = NULL;
     m_hBitmap = (WXHBITMAP) NULL;
     m_hasAlpha = FALSE;
     m_bitmapMask = NULL;
     m_hBitmap = (WXHBITMAP) NULL;
     m_hasAlpha = FALSE;


@@ -1043,11 +1045,15 @@ wxMask *wxBitmap::GetMask() const
     return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
 }
 
     return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
 }
 

+#ifdef __WXDEBUG__
+

 wxDC *wxBitmap::GetSelectedInto() const
 {
     return GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC *) NULL;
 }
 
 wxDC *wxBitmap::GetSelectedInto() const
 {
     return GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC *) NULL;
 }
 

+#endif
+

 #if WXWIN_COMPATIBILITY_2_4
 
 int wxBitmap::GetQuality() const
 #if WXWIN_COMPATIBILITY_2_4
 
 int wxBitmap::GetQuality() const


@@ -1066,12 +1072,16 @@ bool wxBitmap::HasAlpha() const
 // wxBitmap setters
 // ----------------------------------------------------------------------------
 
 // wxBitmap setters
 // ----------------------------------------------------------------------------
 

+#ifdef __WXDEBUG__
+

 void wxBitmap::SetSelectedInto(wxDC *dc)
 {
     if ( GetBitmapData() )
         GetBitmapData()->m_selectedInto = dc;
 }
 
 void wxBitmap::SetSelectedInto(wxDC *dc)
 {
     if ( GetBitmapData() )
         GetBitmapData()->m_selectedInto = dc;
 }
 

+#endif
+

 #if wxUSE_PALETTE
 
 void wxBitmap::SetPalette(const wxPalette& palette)
 #if wxUSE_PALETTE
 
 void wxBitmap::SetPalette(const wxPalette& palette)

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 0bc5904ba81ba8e4b00a2e6118d1ffd31f192cf0..63eadae25369f269c5436476baf88eb52017c971 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -273,10 +273,12 @@ void wxDC::SelectOldObjects(WXHDC dc)
         if (m_oldBitmap)
         {
             ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
         if (m_oldBitmap)
         {
             ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);

+#ifdef __WXDEBUG__

             if (m_selectedBitmap.Ok())
             {
                 m_selectedBitmap.SetSelectedInto(NULL);
             }
             if (m_selectedBitmap.Ok())
             {
                 m_selectedBitmap.SetSelectedInto(NULL);
             }

+#endif

         }
         m_oldBitmap = 0;
         if (m_oldPen)
         }
         m_oldBitmap = 0;
         if (m_oldPen)

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index 7a2de900bf59a8d8ca02ccf9d1042569aad6fdb3..4f169bec64b585683376929f504e980dcc649327 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -104,7 +104,9 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
         ::SelectObject(GetHdc(), (HBITMAP) m_oldBitmap);
         if ( m_selectedBitmap.Ok() )
         {
         ::SelectObject(GetHdc(), (HBITMAP) m_oldBitmap);
         if ( m_selectedBitmap.Ok() )
         {

+#ifdef __WXDEBUG__

             m_selectedBitmap.SetSelectedInto(NULL);
             m_selectedBitmap.SetSelectedInto(NULL);

+#endif

             m_selectedBitmap = wxNullBitmap;
         }
     }
             m_selectedBitmap = wxNullBitmap;
         }
     }


@@ -119,7 +121,9 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
     if ( !hBmp )
         return;
 
     if ( !hBmp )
         return;
 

+#ifdef __WXDEBUG__

     m_selectedBitmap.SetSelectedInto(this);
     m_selectedBitmap.SetSelectedInto(this);

+#endif

     hBmp = (WXHBITMAP)::SelectObject(GetHdc(), (HBITMAP)hBmp);
 
     if ( !hBmp )
     hBmp = (WXHBITMAP)::SelectObject(GetHdc(), (HBITMAP)hBmp);
 
     if ( !hBmp )