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

Reverted mistaken check-in

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-05-18 01:52:55 +00:00
parent f460c29d59
commit 152e88789d
3 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/listctrl/listtest.cpp
View File

@@ -516,9 +516,9 @@ void MyFrame::InitWithIconItems(bool withText, bool sameIcon)
m_listCtrl->SetImageList(m_imageListNormal, wxIMAGE_LIST_NORMAL); m_listCtrl->SetImageList(m_imageListNormal, wxIMAGE_LIST_NORMAL);
m_listCtrl->SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL); m_listCtrl->SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);
for ( int i = 0; i < NUM_ICONS*20; i++ ) for ( int i = 0; i < NUM_ICONS; i++ )
{ {
int image = i % (NUM_ICONS); int image = sameIcon ? 0 : i;
if ( withText ) if ( withText )
{ {

4
samples/toolbar/toolbar.cpp
View File

@@ -679,10 +679,6 @@ void MyFrame::OnToolLeftClick(wxCommandEvent& event)
{ {
DoDeletePrint(); DoDeletePrint();
} }
if (event.GetId() == IDM_TOOLBAR_OTHER_1)
{
m_tbar->Realize();
}
} }
void MyFrame::OnToolRightClick(wxCommandEvent& event) void MyFrame::OnToolRightClick(wxCommandEvent& event)

29
src/generic/grid.cpp
View File

@@ -7957,24 +7957,23 @@ void wxGrid::ShowCellEditControl()
editor->SetCellAttr( attr ); editor->SetCellAttr( attr );
editor->SetSize( rect ); editor->SetSize( rect );
if (nXMove != 0) editor->GetControl()->Move(
editor->GetControl()->Move( editor->GetControl()->GetPosition().x + nXMove,
editor->GetControl()->GetPosition().x + nXMove, editor->GetControl()->GetPosition().y );
editor->GetControl()->GetPosition().y );
editor->Show( true, attr ); editor->Show( true, attr );
int colXPos = GetColLeft(col); int colXPos = 0;
// for (int i = 0; i < m_currentCellCoords.GetCol(); i++) for (int i = 0; i < m_currentCellCoords.GetCol(); i++)
// { {
// colXPos += GetColSize( i ); colXPos += GetColSize( i );
// } }
// int xUnit = 1, yUnit = 1; int xUnit = 1, yUnit = 1;
// GetScrollPixelsPerUnit( &xUnit, &yUnit ); GetScrollPixelsPerUnit( &xUnit, &yUnit );
// if (col != 0) if (m_currentCellCoords.GetCol() != 0)
// Scroll( colXPos / xUnit - 1, GetScrollPos( wxVERTICAL ) ); Scroll( colXPos / xUnit - 1, GetScrollPos( wxVERTICAL ) );
// else else
// Scroll( colXPos / xUnit, GetScrollPos( wxVERTICAL ) ); Scroll( colXPos / xUnit, GetScrollPos( wxVERTICAL ) );
// recalc dimensions in case we need to // recalc dimensions in case we need to
// expand the scrolled window to account for editor // expand the scrolled window to account for editor