moved wxOverlay into overlay.* files and out of dc.h/dcbase.cpp; implemented wxOverlay for wxDirectFB port
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -88,7 +88,7 @@ void wxCaret::InitGeneric()
|
||||
{
|
||||
m_hasFocus = true;
|
||||
m_blinkedOut = true;
|
||||
#if wxUSE_OVERLAY == 0
|
||||
#if !wxHAS_CARET_USING_OVERLAYS
|
||||
m_xOld =
|
||||
m_yOld = -1;
|
||||
m_bmpUnderCaret.Create(m_width, m_height);
|
||||
@@ -131,7 +131,7 @@ void wxCaret::DoHide()
|
||||
|
||||
void wxCaret::DoMove()
|
||||
{
|
||||
#if wxUSE_OVERLAY
|
||||
#if wxHAS_CARET_USING_OVERLAYS
|
||||
m_overlay.Reset();
|
||||
#endif
|
||||
if ( IsVisible() )
|
||||
@@ -158,7 +158,7 @@ void wxCaret::DoSize()
|
||||
m_countVisible = 0;
|
||||
DoHide();
|
||||
}
|
||||
#if wxUSE_OVERLAY
|
||||
#if wxHAS_CARET_USING_OVERLAYS
|
||||
m_overlay.Reset();
|
||||
#else
|
||||
// Change bitmap size
|
||||
@@ -217,7 +217,7 @@ void wxCaret::Refresh()
|
||||
{
|
||||
wxClientDC dcWin(GetWindow());
|
||||
// this is the new code, switch to 0 if this gives problems
|
||||
#if wxUSE_OVERLAY
|
||||
#if wxHAS_CARET_USING_OVERLAYS
|
||||
wxDCOverlay dcOverlay( m_overlay, &dcWin, m_x, m_y, m_width , m_height );
|
||||
if ( m_blinkedOut )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user