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

& operator should be &&

Browse Source 
virtual OnDismiss() access should match base
extraneous semicolon


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-05-01 17:39:19 +00:00
parent c881da964f
commit a8461d3170
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/generic/datavgen.cpp
View File

@@ -343,7 +343,7 @@ bool wxDataViewToggleCell::SetValue( const wxVariant &value )
{ {
m_toggle = value.GetBool(); m_toggle = value.GetBool();
return true;; return true;
} }
bool wxDataViewToggleCell::GetValue( wxVariant &WXUNUSED(value) ) bool wxDataViewToggleCell::GetValue( wxVariant &WXUNUSED(value) )
@@ -460,10 +460,6 @@ public:
sizer->Fit( this ); sizer->Fit( this );
} }
virtual void OnDismiss()
{
}
void OnCalendar( wxCalendarEvent &event ); void OnCalendar( wxCalendarEvent &event );
wxCalendarCtrl *m_cal; wxCalendarCtrl *m_cal;
@@ -471,6 +467,11 @@ public:
size_t m_col; size_t m_col;
size_t m_row; size_t m_row;
protected:
virtual void OnDismiss()
{
}
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
@@ -1519,7 +1520,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
if (m_lastOnSame) if (m_lastOnSame)
{ {
if ((col == m_currentCol) & (current == m_currentRow) && if ((col == m_currentCol) && (current == m_currentRow) &&
(cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) ) (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) )
{ {
m_renameTimer->Start( 100, true ); m_renameTimer->Start( 100, true );