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

Merge branch 'pvs-fixes-3.0' into 3.0

Browse Source 
See https://github.com/wxWidgets/wxWidgets/pull/470
This commit is contained in:
Vadim Zeitlin
2017-04-29 14:00:38 +02:00
parent e1a6857d5a 717ffcd80c
commit db7d3f692d
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

2
src/richtext/richtextsizepage.cpp
View File

@@ -117,7 +117,7 @@ wxRichTextSizePage::~wxRichTextSizePage()
sm_showAlignmentControls = true; sm_showAlignmentControls = true;
sm_showFloatingAndAlignmentControls = true; sm_showFloatingAndAlignmentControls = true;
sm_showMinMaxSizeControls = true; sm_showMinMaxSizeControls = true;
sm_showMinMaxSizeControls = true; sm_enablePositionAndSizeUnits = true;
sm_enablePositionAndSizeCheckboxes = true; sm_enablePositionAndSizeCheckboxes = true;
////@begin wxRichTextSizePage destruction ////@begin wxRichTextSizePage destruction