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

Re-tagging 2.9.3.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_9_3@70004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-12-14 16:04:44 +00:00
parent 8eb6e409b8 a85b4023d1
commit a07face4c0
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/tools/bld_chm_exe.bat
View File

@@ -1,5 +1,5 @@
rem Uncomment the next line to set the version; used also in wxWidgets.iss rem Uncomment the next line to set the version; used also in wxWidgets.iss
SET WXW_VER=2.9.3-rc2 SET WXW_VER=2.9.3
if (%WXW_VER%)==() SET WXW_VER=SVN if (%WXW_VER%)==() SET WXW_VER=SVN
echo docs building for %WXW_VER% echo docs building for %WXW_VER%

4
src/common/datavcmn.cpp
View File

@@ -672,6 +672,8 @@ wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,
wxDataViewRendererBase::~wxDataViewRendererBase() wxDataViewRendererBase::~wxDataViewRendererBase()
{ {
if ( m_editorCtrl )
DestroyEditControl();
} }
wxDataViewCtrl* wxDataViewRendererBase::GetView() const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
@@ -740,6 +742,8 @@ void wxDataViewRendererBase::DestroyEditControl()
wxPendingDelete.Append(handler); wxPendingDelete.Append(handler);
wxPendingDelete.Append(m_editorCtrl); wxPendingDelete.Append(m_editorCtrl);
m_editorCtrl = NULL;
} }
void wxDataViewRendererBase::CancelEditing() void wxDataViewRendererBase::CancelEditing()

4
src/generic/datavgen.cpp
View File

@@ -2433,7 +2433,7 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
int x, y; int x, y;
m_owner->GetScrollPixelsPerUnit( &x, &y ); m_owner->GetScrollPixelsPerUnit( &x, &y );
int sy = GetLineStart( rows )/y; int sy = GetLineStart( rows )/y;
int sx = 0; int sx = -1;
if( column != -1 ) if( column != -1 )
{ {
wxRect rect = GetClientRect(); wxRect rect = GetClientRect();
@@ -3775,6 +3775,8 @@ bool wxDataViewMainWindow::TryAdvanceCurrentColumn(wxDataViewTreeNode *node, boo
if ( idx >= (int)GetOwner()->GetColumnCount() ) if ( idx >= (int)GetOwner()->GetColumnCount() )
return false; return false;
GetOwner()->EnsureVisible(m_currentRow, idx);
if ( idx < 1 ) if ( idx < 1 )
{ {
// We are going to the left of the second column. Reset to whole-row // We are going to the left of the second column. Reset to whole-row