changed wxHAS_NATIVE_OVERLAY and wxHAS_CARET_USING_OVERLAYS to use #ifdef instead of #if ... == 1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-10-25 12:12:56 +00:00
parent 4876ba0b23
commit 69a5bc231a
9 changed files with 25 additions and 33 deletions

View File

@@ -72,7 +72,7 @@ void wxGenericDragImage::Init()
m_windowDC = (wxDC*) NULL;
m_window = (wxWindow*) NULL;
m_fullScreen = false;
#if wxHAS_NATIVE_OVERLAY
#ifdef wxHAS_NATIVE_OVERLAY
m_dcOverlay = NULL;
#else
m_pBackingBitmap = (wxBitmap*) NULL;
@@ -288,7 +288,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
}
}
#if !wxHAS_NATIVE_OVERLAY
#ifndef wxHAS_NATIVE_OVERLAY
wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
if (!backing->Ok() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y))
@@ -356,7 +356,7 @@ bool wxGenericDragImage::EndDrag()
if (m_windowDC)
{
#if wxHAS_NATIVE_OVERLAY
#ifdef wxHAS_NATIVE_OVERLAY
m_overlay.Reset();
#else
m_windowDC->DestroyClippingRegion();
@@ -365,7 +365,7 @@ bool wxGenericDragImage::EndDrag()
m_windowDC = (wxDC*) NULL;
}
#if !wxHAS_NATIVE_OVERLAY
#ifndef wxHAS_NATIVE_OVERLAY
m_repairBitmap = wxNullBitmap;
#endif
@@ -409,7 +409,7 @@ bool wxGenericDragImage::Show()
// This is where we restore the backing bitmap, in case
// something has changed on the window.
#if !wxHAS_NATIVE_OVERLAY
#ifndef wxHAS_NATIVE_OVERLAY
wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
wxMemoryDC memDC;
memDC.SelectObject(* backing);
@@ -460,7 +460,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo
if (!m_windowDC)
return false;
#if wxHAS_NATIVE_OVERLAY
#ifdef wxHAS_NATIVE_OVERLAY
wxDCOverlay dcoverlay( m_overlay, (wxWindowDC*) m_windowDC ) ;
if ( eraseOld )
dcoverlay.Clear() ;