X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4b8bf2fd1fab57c46063f5955fe24ba3ed2c23e..05e0b047d879cdbfade7f2ab346c0acdf3e29f96:/src/generic/caret.cpp diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp index 444a59fea1..6fb06d61a3 100644 --- a/src/generic/caret.cpp +++ b/src/generic/caret.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 25.05.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "caret.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -53,14 +49,14 @@ static int gs_blinkTime = 500; // in milliseconds // timer stuff // ---------------------------------------------------------------------------- -wxCaretTimer::wxCaretTimer(wxCaret *caret) -{ - m_caret = caret; +wxCaretTimer::wxCaretTimer(wxCaret *caret) +{ + m_caret = caret; } -void wxCaretTimer::Notify() -{ - m_caret->OnTimer(); +void wxCaretTimer::Notify() +{ + m_caret->OnTimer(); } void wxCaret::OnTimer() @@ -90,12 +86,13 @@ void wxCaretBase::SetBlinkTime(int milliseconds) void wxCaret::InitGeneric() { - m_hasFocus = TRUE; - m_blinkedOut = FALSE; - + m_hasFocus = true; + m_blinkedOut = true; +#ifndef wxHAS_CARET_USING_OVERLAYS m_xOld = m_yOld = -1; m_bmpUnderCaret.Create(m_width, m_height); +#endif } wxCaret::~wxCaret() @@ -118,8 +115,8 @@ void wxCaret::DoShow() if ( blinkTime ) m_timer.Start(blinkTime); - m_blinkedOut = TRUE; - Blink(); + if ( m_blinkedOut ) + Blink(); } void wxCaret::DoHide() @@ -134,6 +131,9 @@ void wxCaret::DoHide() void wxCaret::DoMove() { +#ifdef wxHAS_CARET_USING_OVERLAYS + m_overlay.Reset(); +#endif if ( IsVisible() ) { if ( !m_blinkedOut ) @@ -150,20 +150,42 @@ void wxCaret::DoMove() //else: will be shown at the correct location when it is shown } +void wxCaret::DoSize() +{ + int countVisible = m_countVisible; + if (countVisible > 0) + { + m_countVisible = 0; + DoHide(); + } +#ifdef wxHAS_CARET_USING_OVERLAYS + m_overlay.Reset(); +#else + // Change bitmap size + m_bmpUnderCaret = wxBitmap(m_width, m_height); +#endif + if (countVisible > 0) + { + m_countVisible = countVisible; + DoShow(); + } +} + // ---------------------------------------------------------------------------- // handling the focus // ---------------------------------------------------------------------------- void wxCaret::OnSetFocus() { - m_hasFocus = TRUE; + m_hasFocus = true; - Refresh(); + if ( IsVisible() ) + Refresh(); } void wxCaret::OnKillFocus() { - m_hasFocus = FALSE; + m_hasFocus = false; if ( IsVisible() ) { @@ -194,6 +216,18 @@ void wxCaret::Blink() void wxCaret::Refresh() { wxClientDC dcWin(GetWindow()); +// this is the new code, switch to 0 if this gives problems +#ifdef wxHAS_CARET_USING_OVERLAYS + wxDCOverlay dcOverlay( m_overlay, &dcWin, m_x, m_y, m_width , m_height ); + if ( m_blinkedOut ) + { + dcOverlay.Clear(); + } + else + { + DoDraw( &dcWin, GetWindow() ); + } +#else wxMemoryDC dcMem; dcMem.SelectObject(m_bmpUnderCaret); if ( m_blinkedOut ) @@ -209,8 +243,17 @@ void wxCaret::Refresh() if ( m_xOld == -1 && m_yOld == -1 ) { // save the part we're going to overdraw + + int x = m_x, + y = m_y; +#if defined(__WXGTK__) && !defined(__WX_DC_BLIT_FIXED__) + wxPoint pt = dcWin.GetDeviceOrigin(); + x += pt.x; + y += pt.y; +#endif // broken wxGTK wxDC::Blit dcMem.Blit(0, 0, m_width, m_height, - &dcWin, m_x, m_y); + &dcWin, x, y); + m_xOld = m_x; m_yOld = m_y; } @@ -218,16 +261,28 @@ void wxCaret::Refresh() // more // and draw the caret there - DoDraw(&dcWin); + DoDraw(&dcWin, GetWindow()); } +#endif } -void wxCaret::DoDraw(wxDC *dc) +void wxCaret::DoDraw(wxDC *dc, wxWindow* win) { - dc->SetPen( *wxBLACK_PEN ); - - dc->SetBrush(*(m_hasFocus ? wxBLACK_BRUSH : wxTRANSPARENT_BRUSH)); - dc->SetPen(*wxBLACK_PEN); + wxPen pen(*wxBLACK_PEN); + wxBrush brush(*wxBLACK_BRUSH); + if (win) + { + wxColour backgroundColour(win->GetBackgroundColour()); + if (backgroundColour.Red() < 100 && + backgroundColour.Green() < 100 && + backgroundColour.Blue() < 100) + { + pen = *wxWHITE_PEN; + brush = *wxWHITE_BRUSH; + } + } + dc->SetPen( pen ); + dc->SetBrush(m_hasFocus ? brush : *wxTRANSPARENT_BRUSH); // VZ: unfortunately, the rectangle comes out a pixel smaller when this is // done under wxGTK - no idea why