Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some work on GTK focus handling and events.

Browse Source 
Removed some code #ifdeffed for GTK from
    wxListCtrl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-02-23 18:59:46 +00:00
parent 890f8a7c00
commit afbe906abd
8 changed files with 53 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/generic/listctrl.cpp
View File

@@ -2662,14 +2662,6 @@ void wxListMainWindow::RefreshSelected()
to = GetItemCount() - 1;
}
// VZ: this code would work fine if wxGTK wxWindow::Refresh() were
// reasonable, i.e. if it only generated one expose event for
// several calls to it - as it is, each Refresh() results in a
// repaint which provokes flicker too horrible to be seen
//
// when/if wxGTK is fixed, this code should be restored as normally it
// should generate _less_ flicker than the version below
#ifndef __WXGTK__
if ( HasCurrent() && m_current >= from && m_current <= to )
{
RefreshLine(m_current);
@@ -2683,26 +2675,6 @@ void wxListMainWindow::RefreshSelected()
RefreshLine(line);
}
}
#else // __WXGTK__
size_t selMin = (size_t)-1,
selMax = 0;
for ( size_t line = from; line <= to; line++ )
{
if ( IsHighlighted(line) || (line == m_current) )
{
if ( line < selMin )
selMin = line;
if ( line > selMax )
selMax = line;
}
}
if ( selMin != (size_t)-1 )
{
RefreshLines(selMin, selMax);
}
#endif // !__WXGTK__/__WXGTK__
}
void wxListMainWindow::Freeze()
@@ -3426,10 +3398,6 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
// focus handling
// ----------------------------------------------------------------------------
#ifdef __WXGTK__
extern wxWindow *g_focusWindow;
#endif
void wxListMainWindow::SetFocus()
{
// VS: wxListMainWindow derives from wxPanel (via wxScrolledWindow) and wxPanel
@@ -3466,10 +3434,6 @@ void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
if ( !GetParent() )
return;
#ifdef __WXGTK__
g_focusWindow = GetParent();
#endif
wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() );
event.SetEventObject( GetParent() );
GetParent()->GetEventHandler()->ProcessEvent( event );
@@ -4437,10 +4401,8 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
wxListCtrl* lc = GetListCtrl();
wxCHECK_RET( lc, _T("no listctrl window?") );
lc->m_headerWin->Refresh() ;
#ifdef __WXMAC__
lc->m_headerWin->MacUpdateImmediately() ;
#endif
lc->m_headerWin->Refresh();
lc->m_headerWin->Update();
}
}