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

TRUE/true, FALSE/false, whitespace cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-08-16 12:45:46 +00:00
parent a29b55cdf6
commit 0a0e6a5baf
14 changed files with 1007 additions and 1007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/msw/ole/access.h
View File

@@ -16,9 +16,7 @@
#pragma interface #pragma interface
#endif #endif
#if !wxUSE_ACCESSIBILITY #if wxUSE_ACCESSIBILITY
#error "You should #define wxUSE_ACCESSIBILITY to 1 to compile this file!"
#endif //wxUSE_ACCESSIBILITY
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// forward declarations // forward declarations
@@ -68,5 +66,7 @@ private:
DECLARE_NO_COPY_CLASS(wxAccessible) DECLARE_NO_COPY_CLASS(wxAccessible)
}; };
#endif //wxUSE_ACCESSIBILITY
#endif //_WX_ACCESS_H_ #endif //_WX_ACCESS_H_

68
include/wx/msw/ole/automtn.h
View File

@@ -37,58 +37,58 @@ public:
wxAutomationObject(WXIDISPATCH* dispatchPtr = NULL); wxAutomationObject(WXIDISPATCH* dispatchPtr = NULL);
~wxAutomationObject(); ~wxAutomationObject();
// Set/get dispatch pointer // Set/get dispatch pointer
inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; }; inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; };
inline WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; } inline WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; }
// Get a dispatch pointer from the current object associated // Get a dispatch pointer from the current object associated
// with a class id, such as "Excel.Application" // with a class id, such as "Excel.Application"
bool GetInstance(const wxString& classId) const; bool GetInstance(const wxString& classId) const;
// Get a dispatch pointer from a new instance of the the class // Get a dispatch pointer from a new instance of the the class
bool CreateInstance(const wxString& classId) const; bool CreateInstance(const wxString& classId) const;
// Low-level invocation function. Pass either an array of variants, // Low-level invocation function. Pass either an array of variants,
// or an array of pointers to variants. // or an array of pointers to variants.
bool Invoke(const wxString& member, int action, bool Invoke(const wxString& member, int action,
wxVariant& retValue, int noArgs, wxVariant args[], const wxVariant* ptrArgs[] = 0) const; wxVariant& retValue, int noArgs, wxVariant args[], const wxVariant* ptrArgs[] = 0) const;
// Invoke a member function // Invoke a member function
wxVariant CallMethod(const wxString& method, int noArgs, wxVariant args[]); wxVariant CallMethod(const wxString& method, int noArgs, wxVariant args[]);
wxVariant CallMethodArray(const wxString& method, int noArgs, const wxVariant **args); wxVariant CallMethodArray(const wxString& method, int noArgs, const wxVariant **args);
// Convenience function // Convenience function
wxVariant CallMethod(const wxString& method, wxVariant CallMethod(const wxString& method,
const wxVariant& arg1 = wxNullVariant, const wxVariant& arg2 = wxNullVariant, const wxVariant& arg1 = wxNullVariant, const wxVariant& arg2 = wxNullVariant,
const wxVariant& arg3 = wxNullVariant, const wxVariant& arg4 = wxNullVariant, const wxVariant& arg3 = wxNullVariant, const wxVariant& arg4 = wxNullVariant,
const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant); const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant);
// Get/Put property // Get/Put property
wxVariant GetProperty(const wxString& property, int noArgs = 0, wxVariant args[] = (wxVariant*) NULL) const; wxVariant GetProperty(const wxString& property, int noArgs = 0, wxVariant args[] = (wxVariant*) NULL) const;
wxVariant GetPropertyArray(const wxString& property, int noArgs, const wxVariant **args) const; wxVariant GetPropertyArray(const wxString& property, int noArgs, const wxVariant **args) const;
wxVariant GetProperty(const wxString& property, wxVariant GetProperty(const wxString& property,
const wxVariant& arg1, const wxVariant& arg2 = wxNullVariant, const wxVariant& arg1, const wxVariant& arg2 = wxNullVariant,
const wxVariant& arg3 = wxNullVariant, const wxVariant& arg4 = wxNullVariant, const wxVariant& arg3 = wxNullVariant, const wxVariant& arg4 = wxNullVariant,
const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant); const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant);
bool PutPropertyArray(const wxString& property, int noArgs, const wxVariant **args); bool PutPropertyArray(const wxString& property, int noArgs, const wxVariant **args);
bool PutProperty(const wxString& property, int noArgs, wxVariant args[]) ; bool PutProperty(const wxString& property, int noArgs, wxVariant args[]) ;
bool PutProperty(const wxString& property, bool PutProperty(const wxString& property,
const wxVariant& arg1, const wxVariant& arg2 = wxNullVariant, const wxVariant& arg1, const wxVariant& arg2 = wxNullVariant,
const wxVariant& arg3 = wxNullVariant, const wxVariant& arg4 = wxNullVariant, const wxVariant& arg3 = wxNullVariant, const wxVariant& arg4 = wxNullVariant,
const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant); const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant);
// Uses DISPATCH_PROPERTYGET // Uses DISPATCH_PROPERTYGET
// and returns a dispatch pointer. The calling code should call Release // and returns a dispatch pointer. The calling code should call Release
// on the pointer, though this could be implicit by constructing an wxAutomationObject // on the pointer, though this could be implicit by constructing an wxAutomationObject
// with it and letting the destructor call Release. // with it and letting the destructor call Release.
WXIDISPATCH* GetDispatchProperty(const wxString& property, int noArgs, wxVariant args[]) const; WXIDISPATCH* GetDispatchProperty(const wxString& property, int noArgs, wxVariant args[]) const;
WXIDISPATCH* GetDispatchProperty(const wxString& property, int noArgs, const wxVariant **args) const; WXIDISPATCH* GetDispatchProperty(const wxString& property, int noArgs, const wxVariant **args) const;
// A way of initialising another wxAutomationObject with a dispatch object, // A way of initialising another wxAutomationObject with a dispatch object,
// without having to deal with nasty IDispatch pointers. // without having to deal with nasty IDispatch pointers.
bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = (wxVariant*) NULL) const; bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = (wxVariant*) NULL) const;
bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs, const wxVariant **args) const; bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs, const wxVariant **args) const;
public: public:
WXIDISPATCH* m_dispatchPtr; WXIDISPATCH* m_dispatchPtr;

2
include/wx/msw/ole/dataform.h
View File

@@ -57,7 +57,7 @@ public:
wxString GetId() const; wxString GetId() const;
void SetId(const wxChar *format); void SetId(const wxChar *format);
// returns TRUE if the format is one of those defined in wxDataFormatId // returns true if the format is one of those defined in wxDataFormatId
bool IsStandard() const { return m_format > 0 && m_format < wxDF_PRIVATE; } bool IsStandard() const { return m_format > 0 && m_format < wxDF_PRIVATE; }
private: private:

2
include/wx/msw/ole/dataobj.h
View File

@@ -36,7 +36,7 @@ public:
// it is deleted, it should delete us as well // it is deleted, it should delete us as well
void SetAutoDelete(); void SetAutoDelete();
// return TRUE if we support this format in "Get" direction // return true if we support this format in "Get" direction
bool IsSupportedFormat(const wxDataFormat& format) const bool IsSupportedFormat(const wxDataFormat& format) const
{ return wxDataObjectBase::IsSupported(format, Get); } { return wxDataObjectBase::IsSupported(format, Get); }

6
include/wx/msw/ole/dropsrc.h
View File

@@ -16,9 +16,7 @@
#pragma interface #pragma interface
#endif #endif
#if !wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#error "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!"
#endif //WX_DRAG_DROP
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// forward declarations // forward declarations
@@ -80,4 +78,6 @@ private:
DECLARE_NO_COPY_CLASS(wxDropSource) DECLARE_NO_COPY_CLASS(wxDropSource)
}; };
#endif //wxUSE_DRAG_AND_DROP
#endif //_WX_OLEDROPSRC_H #endif //_WX_OLEDROPSRC_H

6
include/wx/msw/ole/droptgt.h
View File

@@ -16,9 +16,7 @@
#pragma interface "droptgt.h" #pragma interface "droptgt.h"
#endif #endif
#if !wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#error "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!"
#endif //WX_DRAG_DROP
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// forward declarations // forward declarations
@@ -73,4 +71,6 @@ private:
DECLARE_NO_COPY_CLASS(wxDropTarget) DECLARE_NO_COPY_CLASS(wxDropTarget)
}; };
#endif //wxUSE_DRAG_AND_DROP
#endif //_WX_OLEDROPTGT_H #endif //_WX_OLEDROPTGT_H

12
include/wx/msw/ole/oleutils.h
View File

@@ -39,7 +39,7 @@ inline void ReleaseInterface(IUnknown *pIUnk)
// release the interface pointer (if !NULL) and make it NULL // release the interface pointer (if !NULL) and make it NULL
#define RELEASE_AND_NULL(p) if ( (p) != NULL ) { p->Release(); p = NULL; }; #define RELEASE_AND_NULL(p) if ( (p) != NULL ) { p->Release(); p = NULL; };
// return TRUE if the iid is in the array // return true if the iid is in the array
extern bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount); extern bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
// ============================================================================ // ============================================================================
@@ -73,7 +73,7 @@ public:
operator ULONG&() { return m_Value; } operator ULONG&() { return m_Value; }
ULONG& operator=(ULONG value) { m_Value = value; return m_Value; } ULONG& operator=(ULONG value) { m_Value = value; return m_Value; }
wxAutoULong& operator++() { ++m_Value; return *this; } wxAutoULong& operator++() { ++m_Value; return *this; }
const wxAutoULong operator++( int ) { wxAutoULong temp = *this; ++m_Value; return temp; } const wxAutoULong operator++( int ) { wxAutoULong temp = *this; ++m_Value; return temp; }
@@ -176,20 +176,20 @@ public:
wxBasicString(const char *sz); wxBasicString(const char *sz);
wxBasicString(const wxString& str); wxBasicString(const wxString& str);
~wxBasicString(); ~wxBasicString();
void Init(const char* sz); void Init(const char* sz);
// accessors // accessors
// just get the string // just get the string
operator BSTR() const { return m_wzBuf; } operator BSTR() const { return m_wzBuf; }
// retrieve a copy of our string - caller must SysFreeString() it later! // retrieve a copy of our string - caller must SysFreeString() it later!
BSTR Get() const { return SysAllocString(m_wzBuf); } BSTR Get() const { return SysAllocString(m_wzBuf); }
private: private:
// @@@ not implemented (but should be) // @@@ not implemented (but should be)
wxBasicString(const wxBasicString&); wxBasicString(const wxBasicString&);
wxBasicString& operator=(const wxBasicString&); wxBasicString& operator=(const wxBasicString&);
OLECHAR *m_wzBuf; // actual string OLECHAR *m_wzBuf; // actual string
}; };

8
include/wx/msw/ole/uuid.h
View File

@@ -2,7 +2,7 @@
// Name: ole/uuid.h // Name: ole/uuid.h
// Purpose: encapsulates an UUID with some added helper functions // Purpose: encapsulates an UUID with some added helper functions
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
// Created: 11.07.97 // Created: 11.07.97
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr> // Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -25,7 +25,7 @@
// ----- taken from RPC.H // ----- taken from RPC.H
#ifndef UUID_DEFINED // in some cases RPC.H will be already #ifndef UUID_DEFINED // in some cases RPC.H will be already
#ifdef __WIN32__ // included, so avoid redefinition #ifdef __WIN32__ // included, so avoid redefinition
typedef struct typedef struct
{ {
unsigned long Data1; unsigned long Data1;
unsigned short Data2; unsigned short Data2;
@@ -51,7 +51,7 @@ class WXDLLEXPORT Uuid
{ {
private: private:
UUID m_uuid; UUID m_uuid;
wxUChar *m_pszUuid; // this string is alloc'd and freed by RPC wxUChar *m_pszUuid; // this string is alloc'd and freed by RPC
wxChar *m_pszCForm; // this string is allocated in Set/Create wxChar *m_pszCForm; // this string is allocated in Set/Create
void UuidToCForm(); void UuidToCForm();
@@ -73,7 +73,7 @@ public:
// create a brand new UUID // create a brand new UUID
void Create(); void Create();
// set value of UUID // set value of UUID
bool Set(const wxChar *pc); // from a string, returns true if ok bool Set(const wxChar *pc); // from a string, returns true if ok
void Set(const UUID& uuid); // from another UUID (never fails) void Set(const UUID& uuid); // from another UUID (never fails)

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

@@ -199,12 +199,12 @@ public:
// Navigation and Hierarchy // Navigation and Hierarchy
// Retrieves the child element or child object at a given point on the screen. // Retrieves the child element or child object at a given point on the screen.
// All visual objects support this method; sound objects do not support it. // All visual objects support this method; sound objects do not support it.
STDMETHODIMP accHitTest(long xLeft, long yLeft, VARIANT* pVarID); STDMETHODIMP accHitTest(long xLeft, long yLeft, VARIANT* pVarID);
// Retrieves the specified object's current screen location. All visual objects must // Retrieves the specified object's current screen location. All visual objects must
// support this method; sound objects do not support it. // support this method; sound objects do not support it.
STDMETHODIMP accLocation ( long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID); STDMETHODIMP accLocation ( long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID);
@@ -215,29 +215,29 @@ public:
// Retrieves the address of an IDispatch interface for the specified child. // Retrieves the address of an IDispatch interface for the specified child.
// All objects must support this property. // All objects must support this property.
STDMETHODIMP get_accChild ( VARIANT varChildID, IDispatch** ppDispChild); STDMETHODIMP get_accChild ( VARIANT varChildID, IDispatch** ppDispChild);
// Retrieves the number of children that belong to this object. // Retrieves the number of children that belong to this object.
// All objects must support this property. // All objects must support this property.
STDMETHODIMP get_accChildCount ( long* pCountChildren); STDMETHODIMP get_accChildCount ( long* pCountChildren);
// Retrieves the IDispatch interface of the object's parent. // Retrieves the IDispatch interface of the object's parent.
// All objects support this property. // All objects support this property.
STDMETHODIMP get_accParent ( IDispatch** ppDispParent); STDMETHODIMP get_accParent ( IDispatch** ppDispParent);
// Descriptive Properties and Methods // Descriptive Properties and Methods
// Performs the object's default action. Not all objects have a default // Performs the object's default action. Not all objects have a default
// action. // action.
STDMETHODIMP accDoDefaultAction(VARIANT varID); STDMETHODIMP accDoDefaultAction(VARIANT varID);
// Retrieves a string that describes the object's default action. // Retrieves a string that describes the object's default action.
// Not all objects have a default action. // Not all objects have a default action.
STDMETHODIMP get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction); STDMETHODIMP get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction);
// Retrieves a string that describes the visual appearance of the specified object. // Retrieves a string that describes the visual appearance of the specified object.
@@ -253,18 +253,18 @@ public:
// Retrieves the full path of the WinHelp file associated with the specified // Retrieves the full path of the WinHelp file associated with the specified
// object and the identifier of the appropriate topic within that file. // object and the identifier of the appropriate topic within that file.
// Not all objects support this property. // Not all objects support this property.
STDMETHODIMP get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic); STDMETHODIMP get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic);
// Retrieves the specified object's shortcut key or access key, also known as // Retrieves the specified object's shortcut key or access key, also known as
// the mnemonic. All objects that have a shortcut key or access key support // the mnemonic. All objects that have a shortcut key or access key support
// this property. // this property.
STDMETHODIMP get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut); STDMETHODIMP get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut);
// Retrieves the name of the specified object. // Retrieves the name of the specified object.
// All objects support this property. // All objects support this property.
STDMETHODIMP get_accName ( VARIANT varID, BSTR* pszName); STDMETHODIMP get_accName ( VARIANT varID, BSTR* pszName);
// Retrieves information that describes the role of the specified object. // Retrieves information that describes the role of the specified object.
@@ -274,9 +274,9 @@ public:
// Retrieves the current state of the specified object. // Retrieves the current state of the specified object.
// All objects support this property. // All objects support this property.
STDMETHODIMP get_accState ( VARIANT varID, VARIANT* pVarState); STDMETHODIMP get_accState ( VARIANT varID, VARIANT* pVarState);
// Retrieves the value of the specified object. // Retrieves the value of the specified object.
// Not all objects have a value. // Not all objects have a value.
@@ -292,12 +292,12 @@ public:
// Retrieves the object that has the keyboard focus. All objects // Retrieves the object that has the keyboard focus. All objects
// that receive the keyboard focus must support this property. // that receive the keyboard focus must support this property.
STDMETHODIMP get_accFocus ( VARIANT* pVarID); STDMETHODIMP get_accFocus ( VARIANT* pVarID);
// Retrieves the selected children of this object. All objects // Retrieves the selected children of this object. All objects
// selected must support this property. // selected must support this property.
STDMETHODIMP get_accSelection ( VARIANT * pVarChildren); STDMETHODIMP get_accSelection ( VARIANT * pVarChildren);
// Obsolete // Obsolete
@@ -322,9 +322,9 @@ public:
// Invoke // Invoke
STDMETHODIMP Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, STDMETHODIMP Invoke(DISPID dispIdMember, REFIID riid, LCID lcid,
WORD wFlags, DISPPARAMS *pDispParams, WORD wFlags, DISPPARAMS *pDispParams,
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, VARIANT *pVarResult, EXCEPINFO *pExcepInfo,
unsigned int *puArgErr ); unsigned int *puArgErr );
// Helpers // Helpers
@@ -366,7 +366,7 @@ wxIAccessible::wxIAccessible(wxAccessible *pAccessible)
} }
// Retrieves the child element or child object at a given point on the screen. // Retrieves the child element or child object at a given point on the screen.
// All visual objects support this method; sound objects do not support it. // All visual objects support this method; sound objects do not support it.
STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID) STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
{ {
@@ -374,16 +374,16 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
wxAccessible* childObject = NULL; wxAccessible* childObject = NULL;
int childId = 0; int childId = 0;
VariantInit(pVarID); VariantInit(pVarID);
wxAccStatus status = m_pAccessible->HitTest(wxPoint(xLeft, yLeft), & childId, & childObject); wxAccStatus status = m_pAccessible->HitTest(wxPoint(xLeft, yLeft), & childId, & childObject);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Use standard interface instead. // Use standard interface instead.
@@ -393,7 +393,7 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
else else
return stdInterface->accHitTest(xLeft, yLeft, pVarID); return stdInterface->accHitTest(xLeft, yLeft, pVarID);
} }
if (childObject) if (childObject)
{ {
if (childObject == m_pAccessible) if (childObject == m_pAccessible)
@@ -408,9 +408,9 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
if (!childIA) if (!childIA)
return E_NOTIMPL; return E_NOTIMPL;
if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarID->pdispVal) != S_OK) if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarID->pdispVal) != S_OK)
return E_FAIL; return E_FAIL;
pVarID->vt = VT_DISPATCH; pVarID->vt = VT_DISPATCH;
return S_OK; return S_OK;
} }
@@ -426,8 +426,8 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
pVarID->vt = VT_EMPTY; pVarID->vt = VT_EMPTY;
return S_FALSE; return S_FALSE;
} }
#if 0 #if 0
// all cases above already cause some return action so below line // all cases above already cause some return action so below line
// is unreachable and cause unnecessary warning // is unreachable and cause unnecessary warning
return E_NOTIMPL; return E_NOTIMPL;
@@ -435,7 +435,7 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
} }
// Retrieves the specified object's current screen location. All visual objects must // Retrieves the specified object's current screen location. All visual objects must
// support this method; sound objects do not support it. // support this method; sound objects do not support it.
STDMETHODIMP wxIAccessible::accLocation ( long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID) STDMETHODIMP wxIAccessible::accLocation ( long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID)
{ {
@@ -443,13 +443,13 @@ STDMETHODIMP wxIAccessible::accLocation ( long* pxLeft, long* pyTop, long* pcxWi
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
wxRect rect; wxRect rect;
wxAccStatus status = m_pAccessible->GetLocation(rect, varID.lVal); wxAccStatus status = m_pAccessible->GetLocation(rect, varID.lVal);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Try to use child object directly. // Try to use child object directly.
@@ -491,7 +491,7 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
return E_FAIL; return E_FAIL;
wxLogTrace(wxT("access"), wxString(wxT("accNavigate for ")) + m_pAccessible->GetWindow()->GetClassInfo()->GetClassName()); wxLogTrace(wxT("access"), wxString(wxT("accNavigate for ")) + m_pAccessible->GetWindow()->GetClassInfo()->GetClassName());
if ((varStart.vt != VT_I4 && varStart.vt != VT_EMPTY) if ((varStart.vt != VT_I4 && varStart.vt != VT_EMPTY)
#if 0 #if 0
// according to MSDN and sources varStart.vt is unsigned // according to MSDN and sources varStart.vt is unsigned
// so below line cause warning "Condition is always false" // so below line cause warning "Condition is always false"
@@ -502,7 +502,7 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
wxLogTrace(wxT("access"), wxT("Invalid arg for accNavigate")); wxLogTrace(wxT("access"), wxT("Invalid arg for accNavigate"));
return E_INVALIDARG; return E_INVALIDARG;
} }
wxAccessible* elementObject = NULL; wxAccessible* elementObject = NULL;
int elementId = 0; int elementId = 0;
VariantInit(pVarEnd); VariantInit(pVarEnd);
@@ -558,7 +558,7 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
} }
} }
wxLogTrace(wxT("access"), navStr); wxLogTrace(wxT("access"), navStr);
wxAccStatus status = m_pAccessible->Navigate(navDirWX, varStart.lVal, & elementId, wxAccStatus status = m_pAccessible->Navigate(navDirWX, varStart.lVal, & elementId,
& elementObject); & elementObject);
@@ -567,13 +567,13 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
wxLogTrace(wxT("access"), wxT("wxAccessible::Navigate failed")); wxLogTrace(wxT("access"), wxT("wxAccessible::Navigate failed"));
return E_FAIL; return E_FAIL;
} }
if (status == wxACC_FALSE) if (status == wxACC_FALSE)
{ {
wxLogTrace(wxT("access"), wxT("wxAccessible::Navigate found no object in this direction")); wxLogTrace(wxT("access"), wxT("wxAccessible::Navigate found no object in this direction"));
return S_FALSE; return S_FALSE;
} }
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
wxLogTrace(wxT("access"), wxT("Navigate not implemented")); wxLogTrace(wxT("access"), wxT("Navigate not implemented"));
@@ -607,13 +607,13 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
return E_FAIL; return E_FAIL;
} }
HRESULT hResult = objectIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarEnd->pdispVal); HRESULT hResult = objectIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarEnd->pdispVal);
if (hResult != S_OK) if (hResult != S_OK)
{ {
wxLogTrace(wxT("access"), wxT("QueryInterface failed")); wxLogTrace(wxT("access"), wxT("QueryInterface failed"));
return E_FAIL; return E_FAIL;
} }
wxLogTrace(wxT("access"), wxT("Called QueryInterface for Navigate")); wxLogTrace(wxT("access"), wxT("Called QueryInterface for Navigate"));
pVarEnd->vt = VT_DISPATCH; pVarEnd->vt = VT_DISPATCH;
return S_OK; return S_OK;
@@ -639,14 +639,14 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
// Retrieves the address of an IDispatch interface for the specified child. // Retrieves the address of an IDispatch interface for the specified child.
// All objects must support this property. // All objects must support this property.
STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDispChild) STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDispChild)
{ {
wxLogTrace(wxT("access"), wxT("get_accChild")); wxLogTrace(wxT("access"), wxT("get_accChild"));
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
if (varChildID.vt != VT_I4) if (varChildID.vt != VT_I4)
{ {
wxLogTrace(wxT("access"), wxT("Invalid arg for get_accChild")); wxLogTrace(wxT("access"), wxT("Invalid arg for get_accChild"));
@@ -659,7 +659,7 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
AddRef(); AddRef();
return S_OK; return S_OK;
} }
wxAccessible* child = NULL; wxAccessible* child = NULL;
wxAccStatus status = m_pAccessible->GetChild(varChildID.lVal, & child); wxAccStatus status = m_pAccessible->GetChild(varChildID.lVal, & child);
@@ -668,7 +668,7 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
wxLogTrace(wxT("access"), wxT("GetChild failed")); wxLogTrace(wxT("access"), wxT("GetChild failed"));
return E_FAIL; return E_FAIL;
} }
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Use standard interface instead. // Use standard interface instead.
@@ -689,12 +689,12 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
if (!objectIA) if (!objectIA)
return E_NOTIMPL; return E_NOTIMPL;
if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispChild) != S_OK) if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispChild) != S_OK)
{ {
wxLogTrace(wxT("access"), wxT("QueryInterface failed in get_accChild")); wxLogTrace(wxT("access"), wxT("QueryInterface failed in get_accChild"));
return E_FAIL; return E_FAIL;
} }
return S_OK; return S_OK;
} }
else else
@@ -704,7 +704,7 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
} }
} }
#if 0 #if 0
// all cases above already cause some return action so below line // all cases above already cause some return action so below line
// is unreachable and cause unnecessary warning // is unreachable and cause unnecessary warning
return E_NOTIMPL; return E_NOTIMPL;
@@ -713,19 +713,19 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
// Retrieves the number of children that belong to this object. // Retrieves the number of children that belong to this object.
// All objects must support this property. // All objects must support this property.
STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren) STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
{ {
wxLogTrace(wxT("access"), wxT("get_accChildCount")); wxLogTrace(wxT("access"), wxT("get_accChildCount"));
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
int childCount = 0; int childCount = 0;
wxAccStatus status = m_pAccessible->GetChildCount(& childCount); wxAccStatus status = m_pAccessible->GetChildCount(& childCount);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Use standard interface instead. // Use standard interface instead.
@@ -748,7 +748,7 @@ STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
return S_OK; return S_OK;
} }
#if 0 #if 0
// all cases above already cause some return action so below line // all cases above already cause some return action so below line
// is unreachable and cause unnecessary warning // is unreachable and cause unnecessary warning
return E_NOTIMPL; return E_NOTIMPL;
@@ -757,14 +757,14 @@ STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
// Retrieves the IDispatch interface of the object's parent. // Retrieves the IDispatch interface of the object's parent.
// All objects support this property. // All objects support this property.
STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent) STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
{ {
wxLogTrace(wxT("access"), wxT("get_accParent")); wxLogTrace(wxT("access"), wxT("get_accParent"));
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
wxAccessible* parent = NULL; wxAccessible* parent = NULL;
wxAccStatus status = m_pAccessible->GetParent(& parent); wxAccStatus status = m_pAccessible->GetParent(& parent);
@@ -793,12 +793,12 @@ STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
return E_FAIL; return E_FAIL;
wxLogTrace(wxT("access"), wxT("About to call QueryInterface")); wxLogTrace(wxT("access"), wxT("About to call QueryInterface"));
if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispParent) != S_OK) if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispParent) != S_OK)
{ {
wxLogTrace(wxT("access"), wxT("Failed QueryInterface")); wxLogTrace(wxT("access"), wxT("Failed QueryInterface"));
return E_FAIL; return E_FAIL;
} }
wxLogTrace(wxT("access"), wxT("Returning S_OK for get_accParent")); wxLogTrace(wxT("access"), wxT("Returning S_OK for get_accParent"));
return S_OK; return S_OK;
} }
@@ -812,7 +812,7 @@ STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
} }
} }
#if 0 #if 0
// all cases above already cause some return action so below line // all cases above already cause some return action so below line
// is unreachable and cause unnecessary warning // is unreachable and cause unnecessary warning
return E_NOTIMPL; return E_NOTIMPL;
@@ -821,27 +821,27 @@ STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
// Performs the object's default action. Not all objects have a default // Performs the object's default action. Not all objects have a default
// action. // action.
STDMETHODIMP wxIAccessible::accDoDefaultAction(VARIANT varID) STDMETHODIMP wxIAccessible::accDoDefaultAction(VARIANT varID)
{ {
wxLogTrace(wxT("access"), wxT("accDoDefaultAction")); wxLogTrace(wxT("access"), wxT("accDoDefaultAction"));
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
if (varID.vt != VT_I4) if (varID.vt != VT_I4)
{ {
wxLogTrace(wxT("access"), wxT("Invalid arg for accDoDefaultAction")); wxLogTrace(wxT("access"), wxT("Invalid arg for accDoDefaultAction"));
return E_INVALIDARG; return E_INVALIDARG;
} }
wxAccStatus status = m_pAccessible->DoDefaultAction(varID.lVal); wxAccStatus status = m_pAccessible->DoDefaultAction(varID.lVal);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_SUPPORTED) if (status == wxACC_NOT_SUPPORTED)
return DISP_E_MEMBERNOTFOUND; return DISP_E_MEMBERNOTFOUND;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Try to use child object directly. // Try to use child object directly.
@@ -866,28 +866,28 @@ STDMETHODIMP wxIAccessible::accDoDefaultAction(VARIANT varID)
// Retrieves a string that describes the object's default action. // Retrieves a string that describes the object's default action.
// Not all objects have a default action. // Not all objects have a default action.
STDMETHODIMP wxIAccessible::get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction) STDMETHODIMP wxIAccessible::get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction)
{ {
wxLogTrace(wxT("access"), wxT("get_accDefaultAction")); wxLogTrace(wxT("access"), wxT("get_accDefaultAction"));
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
if (varID.vt != VT_I4) if (varID.vt != VT_I4)
{ {
wxLogTrace(wxT("access"), wxT("Invalid arg for get_accDefaultAction")); wxLogTrace(wxT("access"), wxT("Invalid arg for get_accDefaultAction"));
return E_INVALIDARG; return E_INVALIDARG;
} }
wxString defaultAction; wxString defaultAction;
wxAccStatus status = m_pAccessible->GetDefaultAction(varID.lVal, & defaultAction); wxAccStatus status = m_pAccessible->GetDefaultAction(varID.lVal, & defaultAction);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_SUPPORTED) if (status == wxACC_NOT_SUPPORTED)
return DISP_E_MEMBERNOTFOUND; return DISP_E_MEMBERNOTFOUND;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Try to use child object directly. // Try to use child object directly.
@@ -933,18 +933,18 @@ STDMETHODIMP wxIAccessible::get_accDescription ( VARIANT varID, BSTR* pszDescrip
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
if (varID.vt != VT_I4) if (varID.vt != VT_I4)
{ {
wxLogTrace(wxT("access"), wxT("Invalid arg for get_accDescription")); wxLogTrace(wxT("access"), wxT("Invalid arg for get_accDescription"));
return E_INVALIDARG; return E_INVALIDARG;
} }
wxString description; wxString description;
wxAccStatus status = m_pAccessible->GetDescription(varID.lVal, & description); wxAccStatus status = m_pAccessible->GetDescription(varID.lVal, & description);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Try to use child object directly. // Try to use child object directly.
@@ -976,7 +976,7 @@ STDMETHODIMP wxIAccessible::get_accDescription ( VARIANT varID, BSTR* pszDescrip
wxBasicString basicString(description); wxBasicString basicString(description);
* pszDescription = basicString.Get(); * pszDescription = basicString.Get();
return S_OK; return S_OK;
} }
} }
return E_NOTIMPL; return E_NOTIMPL;
} }
@@ -990,18 +990,18 @@ STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
if (varID.vt != VT_I4) if (varID.vt != VT_I4)
{ {
wxLogTrace(wxT("access"), wxT("Invalid arg for get_accHelp")); wxLogTrace(wxT("access"), wxT("Invalid arg for get_accHelp"));
return E_INVALIDARG; return E_INVALIDARG;
} }
wxString helpString; wxString helpString;
wxAccStatus status = m_pAccessible->GetHelpText(varID.lVal, & helpString); wxAccStatus status = m_pAccessible->GetHelpText(varID.lVal, & helpString);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Try to use child object directly. // Try to use child object directly.
@@ -1033,7 +1033,7 @@ STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
wxBasicString basicString(helpString); wxBasicString basicString(helpString);
* pszHelp = basicString.Get(); * pszHelp = basicString.Get();
return S_OK; return S_OK;
} }
} }
return E_NOTIMPL; return E_NOTIMPL;
} }
@@ -1043,24 +1043,24 @@ STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
// Not all objects support this property. // Not all objects support this property.
// NOTE: not supported by wxWidgets at this time. Use // NOTE: not supported by wxWidgets at this time. Use
// GetHelpText instead. // GetHelpText instead.
STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic) STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic)
{ {
wxLogTrace(wxT("access"), wxT("get_accHelpTopic")); wxLogTrace(wxT("access"), wxT("get_accHelpTopic"));
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
if (varChild.vt != VT_I4) if (varChild.vt != VT_I4)
{ {
wxLogTrace(wxT("access"), wxT("Invalid arg for get_accHelpTopic")); wxLogTrace(wxT("access"), wxT("Invalid arg for get_accHelpTopic"));
return E_INVALIDARG; return E_INVALIDARG;
} }
wxAccStatus status = wxACC_NOT_IMPLEMENTED; wxAccStatus status = wxACC_NOT_IMPLEMENTED;
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Try to use child object directly. // Try to use child object directly.
@@ -1086,7 +1086,7 @@ STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChi
// Retrieves the specified object's shortcut key or access key, also known as // Retrieves the specified object's shortcut key or access key, also known as
// the mnemonic. All objects that have a shortcut key or access key support // the mnemonic. All objects that have a shortcut key or access key support
// this property. // this property.
STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut) STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut)
{ {
wxLogTrace(wxT("access"), wxT("get_accKeyboardShortcut")); wxLogTrace(wxT("access"), wxT("get_accKeyboardShortcut"));
@@ -1095,18 +1095,18 @@ STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKe
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
if (varID.vt != VT_I4) if (varID.vt != VT_I4)
{ {
wxLogTrace(wxT("access"), wxT("Invalid arg for get_accKeyboardShortcut")); wxLogTrace(wxT("access"), wxT("Invalid arg for get_accKeyboardShortcut"));
return E_INVALIDARG; return E_INVALIDARG;
} }
wxString keyboardShortcut; wxString keyboardShortcut;
wxAccStatus status = m_pAccessible->GetKeyboardShortcut(varID.lVal, & keyboardShortcut); wxAccStatus status = m_pAccessible->GetKeyboardShortcut(varID.lVal, & keyboardShortcut);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Try to use child object directly. // Try to use child object directly.
@@ -1138,14 +1138,14 @@ STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKe
wxBasicString basicString(keyboardShortcut); wxBasicString basicString(keyboardShortcut);
* pszKeyboardShortcut = basicString.Get(); * pszKeyboardShortcut = basicString.Get();
return S_OK; return S_OK;
} }
} }
return E_NOTIMPL; return E_NOTIMPL;
} }
// Retrieves the name of the specified object. // Retrieves the name of the specified object.
// All objects support this property. // All objects support this property.
STDMETHODIMP wxIAccessible::get_accName ( VARIANT varID, BSTR* pszName) STDMETHODIMP wxIAccessible::get_accName ( VARIANT varID, BSTR* pszName)
{ {
wxLogTrace(wxT("access"), wxT("get_accName")); wxLogTrace(wxT("access"), wxT("get_accName"));
@@ -1160,14 +1160,14 @@ STDMETHODIMP wxIAccessible::get_accName ( VARIANT varID, BSTR* pszName)
wxLogTrace(wxT("access"), wxT("Invalid arg for get_accName")); wxLogTrace(wxT("access"), wxT("Invalid arg for get_accName"));
return E_INVALIDARG; return E_INVALIDARG;
} }
wxString name; wxString name;
wxAccStatus status = m_pAccessible->GetName(varID.lVal, & name); wxAccStatus status = m_pAccessible->GetName(varID.lVal, & name);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Try to use child object directly. // Try to use child object directly.
@@ -1205,22 +1205,22 @@ STDMETHODIMP wxIAccessible::get_accRole ( VARIANT varID, VARIANT* pVarRole)
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
if (varID.vt != VT_I4) if (varID.vt != VT_I4)
{ {
wxLogTrace(wxT("access"), wxT("Invalid arg for get_accRole")); wxLogTrace(wxT("access"), wxT("Invalid arg for get_accRole"));
return E_INVALIDARG; return E_INVALIDARG;
} }
VariantInit(pVarRole); VariantInit(pVarRole);
wxAccRole role = wxROLE_NONE; wxAccRole role = wxROLE_NONE;
wxAccStatus status = m_pAccessible->GetRole(varID.lVal, & role); wxAccStatus status = m_pAccessible->GetRole(varID.lVal, & role);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Try to use child object directly. // Try to use child object directly.
@@ -1258,14 +1258,14 @@ STDMETHODIMP wxIAccessible::get_accRole ( VARIANT varID, VARIANT* pVarRole)
// Retrieves the current state of the specified object. // Retrieves the current state of the specified object.
// All objects support this property. // All objects support this property.
STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState) STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState)
{ {
wxLogTrace(wxT("access"), wxT("get_accState")); wxLogTrace(wxT("access"), wxT("get_accState"));
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
if (varID.vt != VT_I4 && varID.vt != VT_EMPTY) if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
{ {
wxLogTrace(wxT("access"), wxT("Invalid arg for get_accState")); wxLogTrace(wxT("access"), wxT("Invalid arg for get_accState"));
@@ -1273,11 +1273,11 @@ STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState)
} }
long wxstate = 0; long wxstate = 0;
wxAccStatus status = m_pAccessible->GetState(varID.lVal, & wxstate); wxAccStatus status = m_pAccessible->GetState(varID.lVal, & wxstate);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Try to use child object directly. // Try to use child object directly.
@@ -1306,7 +1306,7 @@ STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState)
} }
return E_NOTIMPL; return E_NOTIMPL;
} }
// Retrieves the value of the specified object. // Retrieves the value of the specified object.
// Not all objects have a value. // Not all objects have a value.
@@ -1316,20 +1316,20 @@ STDMETHODIMP wxIAccessible::get_accValue ( VARIANT varID, BSTR* pszValue)
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
if (varID.vt != VT_I4) if (varID.vt != VT_I4)
{ {
wxLogTrace(wxT("access"), wxT("Invalid arg for get_accValue")); wxLogTrace(wxT("access"), wxT("Invalid arg for get_accValue"));
return E_INVALIDARG; return E_INVALIDARG;
} }
wxString strValue; wxString strValue;
wxAccStatus status = m_pAccessible->GetValue(varID.lVal, & strValue); wxAccStatus status = m_pAccessible->GetValue(varID.lVal, & strValue);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Try to use child object directly. // Try to use child object directly.
@@ -1368,19 +1368,19 @@ STDMETHODIMP wxIAccessible::accSelect ( long flagsSelect, VARIANT varID )
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
if (varID.vt != VT_I4 && varID.vt != VT_EMPTY) if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
{ {
wxLogTrace(wxT("access"), wxT("Invalid arg for accSelect")); wxLogTrace(wxT("access"), wxT("Invalid arg for accSelect"));
return E_INVALIDARG; return E_INVALIDARG;
} }
wxAccSelectionFlags wxsel = wxConvertFromWindowsSelFlag(flagsSelect); wxAccSelectionFlags wxsel = wxConvertFromWindowsSelFlag(flagsSelect);
wxAccStatus status = m_pAccessible->Select(varID.lVal, wxsel); wxAccStatus status = m_pAccessible->Select(varID.lVal, wxsel);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Try to use child object directly. // Try to use child object directly.
@@ -1408,22 +1408,22 @@ STDMETHODIMP wxIAccessible::accSelect ( long flagsSelect, VARIANT varID )
// Retrieves the object that has the keyboard focus. All objects // Retrieves the object that has the keyboard focus. All objects
// that receive the keyboard focus must support this property. // that receive the keyboard focus must support this property.
STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID) STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
{ {
wxLogTrace(wxT("access"), wxT("get_accFocus")); wxLogTrace(wxT("access"), wxT("get_accFocus"));
wxASSERT (m_pAccessible != NULL); wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible) if (!m_pAccessible)
return E_FAIL; return E_FAIL;
wxAccessible* childObject = NULL; wxAccessible* childObject = NULL;
int childId = 0; int childId = 0;
VariantInit(pVarID); VariantInit(pVarID);
wxAccStatus status = m_pAccessible->GetFocus(& childId, & childObject); wxAccStatus status = m_pAccessible->GetFocus(& childId, & childObject);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Use standard interface instead. // Use standard interface instead.
@@ -1446,9 +1446,9 @@ STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
if (!childIA) if (!childIA)
return E_NOTIMPL; return E_NOTIMPL;
if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarID->pdispVal) != S_OK) if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarID->pdispVal) != S_OK)
return E_FAIL; return E_FAIL;
pVarID->vt = VT_DISPATCH; pVarID->vt = VT_DISPATCH;
return S_OK; return S_OK;
} }
@@ -1464,8 +1464,8 @@ STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
pVarID->vt = VT_EMPTY; pVarID->vt = VT_EMPTY;
return S_FALSE; return S_FALSE;
} }
#if 0 #if 0
// all cases above already cause some return action so below line // all cases above already cause some return action so below line
// is unreachable and cause unnecessary warning // is unreachable and cause unnecessary warning
return E_NOTIMPL; return E_NOTIMPL;
@@ -1474,7 +1474,7 @@ STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
// Retrieves the selected children of this object. All objects // Retrieves the selected children of this object. All objects
// selected must support this property. // selected must support this property.
STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren) STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
{ {
wxLogTrace(wxT("access"), wxT("get_accSelection")); wxLogTrace(wxT("access"), wxT("get_accSelection"));
@@ -1483,12 +1483,12 @@ STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
return E_FAIL; return E_FAIL;
VariantInit(pVarChildren); VariantInit(pVarChildren);
wxVariant selections; wxVariant selections;
wxAccStatus status = m_pAccessible->GetSelections(& selections); wxAccStatus status = m_pAccessible->GetSelections(& selections);
if (status == wxACC_FAIL) if (status == wxACC_FAIL)
return E_FAIL; return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED) if (status == wxACC_NOT_IMPLEMENTED)
{ {
// Use standard interface instead. // Use standard interface instead.
@@ -1514,9 +1514,9 @@ STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
if (!childIA) if (!childIA)
return E_NOTIMPL; return E_NOTIMPL;
if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarChildren->pdispVal) != S_OK) if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarChildren->pdispVal) != S_OK)
return E_FAIL; return E_FAIL;
pVarChildren->vt = VT_DISPATCH; pVarChildren->vt = VT_DISPATCH;
return S_OK; return S_OK;
@@ -1564,9 +1564,9 @@ STDMETHODIMP wxIAccessible::GetIDsOfNames(REFIID WXUNUSED(riid), OLECHAR** WXUNU
// Invoke // Invoke
STDMETHODIMP wxIAccessible::Invoke(DISPID WXUNUSED(dispIdMember), REFIID WXUNUSED(riid), LCID WXUNUSED(lcid), STDMETHODIMP wxIAccessible::Invoke(DISPID WXUNUSED(dispIdMember), REFIID WXUNUSED(riid), LCID WXUNUSED(lcid),
WORD WXUNUSED(wFlags), DISPPARAMS *WXUNUSED(pDispParams), WORD WXUNUSED(wFlags), DISPPARAMS *WXUNUSED(pDispParams),
VARIANT *WXUNUSED(pVarResult), EXCEPINFO *WXUNUSED(pExcepInfo), VARIANT *WXUNUSED(pVarResult), EXCEPINFO *WXUNUSED(pExcepInfo),
unsigned int *WXUNUSED(puArgErr) ) unsigned int *WXUNUSED(puArgErr) )
{ {
return E_NOTIMPL; return E_NOTIMPL;
@@ -1605,7 +1605,7 @@ IAccessible* wxIAccessible::GetChildStdAccessible(int id)
else else
{ {
pDispatch->Release(); pDispatch->Release();
} }
} }
} }
@@ -1639,7 +1639,7 @@ IAccessible* wxIAccessible::GetChildStdAccessible(int id)
else else
{ {
var.pdispVal->Release(); var.pdispVal->Release();
} }
} }
} }
break; break;
@@ -1679,7 +1679,7 @@ IAccessible* wxIAccessible::GetChildAccessible(int id)
else else
{ {
pDispatch->Release(); pDispatch->Release();
} }
} }
} }
return NULL; return NULL;

1602
src/msw/ole/automtn.cpp
View File

File diff suppressed because it is too large Load Diff

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

@@ -241,11 +241,11 @@ bool wxDropSource::GiveFeedback(wxDragResult effect)
{ {
::SetCursor((HCURSOR)cursor.GetHCURSOR()); ::SetCursor((HCURSOR)cursor.GetHCURSOR());
return TRUE; return true;
} }
else else
{ {
return FALSE; return false;
} }
} }

20
src/msw/ole/droptgt.cpp
View File

@@ -294,7 +294,7 @@ STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource,
} }
//else: *pdwEffect is already DROPEFFECT_NONE //else: *pdwEffect is already DROPEFFECT_NONE
} }
//else: OnDrop() returned FALSE, no need to copy data //else: OnDrop() returned false, no need to copy data
// release the held object // release the held object
RELEASE_AND_NULL(m_pIDataObject); RELEASE_AND_NULL(m_pIDataObject);
@@ -335,7 +335,7 @@ bool wxDropTarget::Register(WXHWND hwnd)
// Or maybe we can dynamically load them from ceshell.dll // Or maybe we can dynamically load them from ceshell.dll
// or similar. // or similar.
#if defined(__WXWINCE__) && _WIN32_WCE >= 400 #if defined(__WXWINCE__) && _WIN32_WCE >= 400
return FALSE; return false;
#else #else
HRESULT hr; HRESULT hr;
@@ -344,7 +344,7 @@ bool wxDropTarget::Register(WXHWND hwnd)
hr = ::CoLockObjectExternal(m_pIDropTarget, TRUE, FALSE); hr = ::CoLockObjectExternal(m_pIDropTarget, TRUE, FALSE);
if ( FAILED(hr) ) { if ( FAILED(hr) ) {
wxLogApiError(wxT("CoLockObjectExternal"), hr); wxLogApiError(wxT("CoLockObjectExternal"), hr);
return FALSE; return false;
} }
#endif #endif
@@ -355,13 +355,13 @@ bool wxDropTarget::Register(WXHWND hwnd)
::CoLockObjectExternal(m_pIDropTarget, FALSE, FALSE); ::CoLockObjectExternal(m_pIDropTarget, FALSE, FALSE);
#endif #endif
wxLogApiError(wxT("RegisterDragDrop"), hr); wxLogApiError(wxT("RegisterDragDrop"), hr);
return FALSE; return false;
} }
// we will need the window handle for coords transformation later // we will need the window handle for coords transformation later
m_pIDropTarget->SetHwnd((HWND)hwnd); m_pIDropTarget->SetHwnd((HWND)hwnd);
return TRUE; return true;
#endif #endif
} }
@@ -389,11 +389,11 @@ void wxDropTarget::Revoke(WXHWND hwnd)
// base class pure virtuals // base class pure virtuals
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// OnDrop() is called only if we previously returned TRUE from // OnDrop() is called only if we previously returned true from
// IsAcceptedData(), so no need to check anything here // IsAcceptedData(), so no need to check anything here
bool wxDropTarget::OnDrop(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) bool wxDropTarget::OnDrop(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
{ {
return TRUE; return true;
} }
// copy the data from the data source to the target data object // copy the data from the data source to the target data object
@@ -404,7 +404,7 @@ bool wxDropTarget::GetData()
// this is strange because IsAcceptedData() succeeded previously! // this is strange because IsAcceptedData() succeeded previously!
wxFAIL_MSG(wxT("strange - did supported formats list change?")); wxFAIL_MSG(wxT("strange - did supported formats list change?"));
return FALSE; return false;
} }
STGMEDIUM stm; STGMEDIUM stm;
@@ -415,7 +415,7 @@ bool wxDropTarget::GetData()
fmtMemory.lindex = -1; fmtMemory.lindex = -1;
fmtMemory.tymed = TYMED_HGLOBAL; // TODO to add other media fmtMemory.tymed = TYMED_HGLOBAL; // TODO to add other media
bool rc = FALSE; bool rc = false;
HRESULT hr = m_pIDataSource->GetData(&fmtMemory, &stm); HRESULT hr = m_pIDataSource->GetData(&fmtMemory, &stm);
if ( SUCCEEDED(hr) ) { if ( SUCCEEDED(hr) ) {
@@ -423,7 +423,7 @@ bool wxDropTarget::GetData()
hr = dataObject->SetData(&fmtMemory, &stm, TRUE); hr = dataObject->SetData(&fmtMemory, &stm, TRUE);
if ( SUCCEEDED(hr) ) { if ( SUCCEEDED(hr) ) {
rc = TRUE; rc = true;
} }
else { else {
wxLogApiError(wxT("IDataObject::SetData()"), hr); wxLogApiError(wxT("IDataObject::SetData()"), hr);

6
src/msw/ole/oleutils.cpp
View File

@@ -60,15 +60,15 @@
// Implementation // Implementation
// ============================================================================ // ============================================================================
// return TRUE if the iid is in the array // return true if the iid is in the array
bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount) bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
{ {
for ( size_t i = 0; i < nCount; i++ ) { for ( size_t i = 0; i < nCount; i++ ) {
if ( riid == *aIids[i] ) if ( riid == *aIids[i] )
return TRUE; return true;
} }
return FALSE; return false;
} }
#if wxUSE_DATAOBJ #if wxUSE_DATAOBJ

18
src/msw/ole/uuid.cpp
View File

@@ -2,7 +2,7 @@
// Name: ole/uuid.cpp // Name: ole/uuid.cpp
// Purpose: implements Uuid class, see uuid.h for details // Purpose: implements Uuid class, see uuid.h for details
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
// Created: 12.09.96 // Created: 12.09.96
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr> // Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -48,8 +48,8 @@
// copy ctor // copy ctor
Uuid::Uuid(const Uuid& uuid) Uuid::Uuid(const Uuid& uuid)
{ {
// bitwise copy Ok for UUIDs // bitwise copy Ok for UUIDs
m_uuid = uuid.m_uuid; m_uuid = uuid.m_uuid;
// force the string to be allocated by RPC // force the string to be allocated by RPC
// (we free it later with RpcStringFree) // (we free it later with RpcStringFree)
@@ -89,11 +89,11 @@ Uuid& Uuid::operator=(const Uuid& uuid)
} }
// dtor // dtor
Uuid::~Uuid() Uuid::~Uuid()
{ {
// this string must be allocated by RPC! // this string must be allocated by RPC!
// (otherwise you get a debug breakpoint deep inside RPC DLL) // (otherwise you get a debug breakpoint deep inside RPC DLL)
if ( m_pszUuid ) if ( m_pszUuid )
#ifdef _UNICODE #ifdef _UNICODE
RpcStringFree((unsigned short **)&m_pszUuid); RpcStringFree((unsigned short **)&m_pszUuid);
#else #else
@@ -129,7 +129,7 @@ void Uuid::Create()
// can't fail // can't fail
UuidCreate(&uuid); UuidCreate(&uuid);
Set(uuid); Set(uuid);
} }
@@ -143,7 +143,7 @@ bool Uuid::Set(const wxChar *pc)
if ( UuidFromString((wxUChar *)pc, &m_uuid) != RPC_S_OK) if ( UuidFromString((wxUChar *)pc, &m_uuid) != RPC_S_OK)
#endif #endif
// failed: probably invalid string // failed: probably invalid string
return FALSE; return false;
// transform it back to string to normalize it // transform it back to string to normalize it
#ifdef _UNICODE #ifdef _UNICODE
@@ -155,7 +155,7 @@ bool Uuid::Set(const wxChar *pc)
// update m_pszCForm // update m_pszCForm
UuidToCForm(); UuidToCForm();
return TRUE; return true;
} }
// stores m_uuid in m_pszCForm in a format required by // stores m_uuid in m_pszCForm in a format required by