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

Use Boolean variable to store Boolean values in wxPG.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Artur Wieczorek
2014-11-24 16:09:46 +00:00
parent a1f83adcec
commit 161e8dcff2
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/propgrid/propgrid.h
View File

@@ -1931,7 +1931,11 @@ protected:
unsigned char m_mouseSide; unsigned char m_mouseSide;
/** True when editor control is focused. */ /** True when editor control is focused. */
#if WXWIN_COMPATIBILITY_3_0
unsigned char m_editorFocused; unsigned char m_editorFocused;
#else
bool m_editorFocused;
#endif
/** 1 if m_latsCaption is also the bottommost caption. */ /** 1 if m_latsCaption is also the bottommost caption. */
//unsigned char m_lastCaptionBottomnest; //unsigned char m_lastCaptionBottomnest;

14
src/propgrid/propgrid.cpp
View File

@@ -370,7 +370,7 @@ void wxPropertyGrid::Init1()
m_permanentValidationFailureBehavior = wxPG_VFB_DEFAULT; m_permanentValidationFailureBehavior = wxPG_VFB_DEFAULT;
m_dragStatus = 0; m_dragStatus = 0;
m_mouseSide = 16; m_mouseSide = 16;
m_editorFocused = 0; m_editorFocused = false;
// Set up default unspecified value 'colour' // Set up default unspecified value 'colour'
m_unspecifiedAppearance.SetFgCol(*wxLIGHT_GREY); m_unspecifiedAppearance.SetFgCol(*wxLIGHT_GREY);
@@ -4092,7 +4092,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
if ( IsFrozen() ) if ( IsFrozen() )
{ {
m_iFlags &= ~(wxPG_FL_ABNORMAL_EDITOR); m_iFlags &= ~(wxPG_FL_ABNORMAL_EDITOR);
m_editorFocused = 0; m_editorFocused = false;
m_pState->DoSetSelection(p); m_pState->DoSetSelection(p);
// If frozen, always free controls. But don't worry, as Thaw will // If frozen, always free controls. But don't worry, as Thaw will
@@ -4117,7 +4117,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
if ( m_wndEditor ) if ( m_wndEditor )
{ {
m_wndEditor->SetFocus(); m_wndEditor->SetFocus();
m_editorFocused = 1; m_editorFocused = true;
} }
} }
else else
@@ -4173,7 +4173,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
int propY = p->GetY2(m_lineHeight); int propY = p->GetY2(m_lineHeight);
int splitterX = GetSplitterPosition(); int splitterX = GetSplitterPosition();
m_editorFocused = 0; m_editorFocused = false;
m_iFlags |= wxPG_FL_PRIMARY_FILLS_ENTIRE; m_iFlags |= wxPG_FL_PRIMARY_FILLS_ENTIRE;
wxASSERT( m_wndEditor == NULL ); wxASSERT( m_wndEditor == NULL );
@@ -4307,7 +4307,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
} }
if ( flags & wxPG_SEL_FOCUS ) if ( flags & wxPG_SEL_FOCUS )
m_editorFocused = 1; m_editorFocused = true;
} }
else else
@@ -4724,7 +4724,7 @@ void wxPropertyGrid::SetFocusOnCanvas()
} }
} }
m_editorFocused = 0; m_editorFocused = false;
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@@ -5285,7 +5285,7 @@ bool wxPropertyGrid::HandleMouseUp( int x, unsigned int WXUNUSED(y),
#endif #endif
// This clears the focus. // This clears the focus.
m_editorFocused = 0; m_editorFocused = false;
} }
return res; return res;