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

fixed asserts when clicking on bugs table priority and opened columns; updated copyrights

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-06-02 11:30:32 +00:00
parent 050a132772
commit e9a67fc247
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
samples/grid/griddemo.cpp
View File

@@ -4,7 +4,7 @@
// Author: Michael Bedward // Author: Michael Bedward
// Modified by: // Modified by:
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Michael Bedward, Julian Smart // Copyright: (c) Michael Bedward, Julian Smart, Vadim Zeitlin
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -935,8 +935,7 @@ void GridFrame::OnEditorHidden( wxGridEvent& ev )
void GridFrame::About( wxCommandEvent& WXUNUSED(ev) ) void GridFrame::About( wxCommandEvent& WXUNUSED(ev) )
{ {
(void)wxMessageBox( _T("\n\nwxGrid demo \n\n") (void)wxMessageBox( _T("\n\nwxGrid demo \n\n")
_T("Michael Bedward \n") _T("Michael Bedward, Julian Small, Vadim Zeitlin"),
_T("mbedward@ozemail.com.au \n\n"),
_T("About"), _T("About"),
wxOK ); wxOK );
} }
@@ -1197,10 +1196,13 @@ wxString BugsGridTable::GetValue( int row, int col )
switch ( col ) switch ( col )
{ {
case Col_Id: case Col_Id:
return wxString::Format(_T("%d"), gd.id);
case Col_Priority: case Col_Priority:
return wxString::Format(_T("%d"), gd.prio);
case Col_Opened: case Col_Opened:
wxFAIL_MSG(_T("unexpected column")); return gd.opened ? _T("1") : _T("0");
break;
case Col_Severity: case Col_Severity:
return severities[gd.severity]; return severities[gd.severity];
@@ -1258,7 +1260,10 @@ void BugsGridTable::SetValue( int row, int col, const wxString& value )
} }
} }
bool BugsGridTable::CanGetValueAs( int WXUNUSED(row), int col, const wxString& typeName ) bool
BugsGridTable::CanGetValueAs(int WXUNUSED(row),
int col,
const wxString& typeName)
{ {
if ( typeName == wxGRID_VALUE_STRING ) if ( typeName == wxGRID_VALUE_STRING )
{ {