diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp index cab33c206c..a5f4c562f1 100644 --- a/src/msw/ole/access.cpp +++ b/src/msw/ole/access.cpp @@ -1937,8 +1937,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 index 293b31f8b3..0578de1f3f 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -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: diff --git a/src/richtext/richtextsizepage.cpp b/src/richtext/richtextsizepage.cpp index e0a6164b58..0cf3569df1 100644 --- a/src/richtext/richtextsizepage.cpp +++ b/src/richtext/richtextsizepage.cpp @@ -117,7 +117,7 @@ wxRichTextSizePage::~wxRichTextSizePage() sm_showAlignmentControls = true; sm_showFloatingAndAlignmentControls = true; sm_showMinMaxSizeControls = true; - sm_showMinMaxSizeControls = true; + sm_enablePositionAndSizeUnits = true; sm_enablePositionAndSizeCheckboxes = true; ////@begin wxRichTextSizePage destruction