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

Merge branch 'pvs-fixes'

Browse Source 
Closes https://github.com/wxWidgets/wxWidgets/pull/470
This commit is contained in:
Vadim Zeitlin 2017-04-29 13:56:47 +02:00
commit 063681162a
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/ole/access.cpp
View File

@ -2037,8 +2037,8 @@ long wxConvertToWindowsState(long wxstate)
if (wxstate & wxACC_STATE_SYSTEM_INVISIBLE)
state |= STATE_SYSTEM_INVISIBLE;
if (wxstate & wxACC_STATE_SYSTEM_INVISIBLE)
state |= STATE_SYSTEM_INVISIBLE;
if (wxstate & wxACC_STATE_SYSTEM_MARQUEED)
state |= STATE_SYSTEM_MARQUEED;
if (wxstate & wxACC_STATE_SYSTEM_MIXED)
state |= STATE_SYSTEM_MIXED;

16
src/msw/ole/activex.cpp
View File

@ -251,24 +251,24 @@ public:
switch (dispIdMember)
{
case DISPID_AMBIENT_MESSAGEREFLECT:
V_BOOL(pVarResult)= FALSE;
V_BOOL(pVarResult)= VARIANT_FALSE;
return S_OK;
case DISPID_AMBIENT_DISPLAYASDEFAULT:
V_BOOL(pVarResult)= TRUE;
V_BOOL(pVarResult)= VARIANT_TRUE;
return S_OK;
case DISPID_AMBIENT_OFFLINEIFNOTCONNECTED:
V_BOOL(pVarResult) = TRUE;
V_BOOL(pVarResult) = VARIANT_TRUE;
return S_OK;
case DISPID_AMBIENT_SILENT:
V_BOOL(pVarResult)= TRUE;
V_BOOL(pVarResult)= VARIANT_TRUE;
return S_OK;
case DISPID_AMBIENT_APPEARANCE:
pVarResult->vt = VT_BOOL;
pVarResult->boolVal = m_bAmbientAppearance;
pVarResult->boolVal = m_bAmbientAppearance ? VARIANT_TRUE : VARIANT_FALSE;
break;
case DISPID_AMBIENT_FORECOLOR:
@ -288,17 +288,17 @@ public:
case DISPID_AMBIENT_USERMODE:
pVarResult->vt = VT_BOOL;
pVarResult->boolVal = m_window->m_bAmbientUserMode;
pVarResult->boolVal = m_window->m_bAmbientUserMode ? VARIANT_TRUE : VARIANT_FALSE;
break;
case DISPID_AMBIENT_SHOWGRABHANDLES:
pVarResult->vt = VT_BOOL;
pVarResult->boolVal = m_bAmbientShowGrabHandles;
pVarResult->boolVal = m_bAmbientShowGrabHandles ? VARIANT_TRUE : VARIANT_FALSE;
break;
case DISPID_AMBIENT_SHOWHATCHING:
pVarResult->vt = VT_BOOL;
pVarResult->boolVal = m_bAmbientShowHatching;
pVarResult->boolVal = m_bAmbientShowHatching ? VARIANT_TRUE : VARIANT_FALSE;
break;
default:

2
src/richtext/richtextbuffer.cpp
View File

@ -9932,7 +9932,7 @@ bool wxRichTextCell::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
wxRichTextAttr attr;
wxRichTextSelection sel;
if (buffer->GetRichTextCtrl())
if (buffer && buffer->GetRichTextCtrl())
sel = buffer->GetRichTextCtrl()->GetSelection();
if (table && buffer && buffer->GetRichTextCtrl() && sel.IsValid() &&

2
src/richtext/richtextsizepage.cpp
View File

@ -116,7 +116,7 @@ wxRichTextSizePage::~wxRichTextSizePage()
sm_showAlignmentControls = true;
sm_showFloatingAndAlignmentControls = true;
sm_showMinMaxSizeControls = true;
sm_showMinMaxSizeControls = true;
sm_enablePositionAndSizeUnits = true;
sm_enablePositionAndSizeCheckboxes = true;
sm_showMoveObjectControls = true;