Merge branch 'pvs-fixes'

Closes wxWidgets#470
codereader · Apr 29, 2017 · 0636811 · 0636811
2 parents 5e24bd1 + 6697a7e
commit 0636811
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
@@ -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;

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
@@ -251,24 +251,24 @@ class FrameSite :
         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 @@ class FrameSite :
 
             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:

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
@@ -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() &&

diff --git a/src/richtext/richtextsizepage.cpp b/src/richtext/richtextsizepage.cpp
@@ -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;