From c6212697785a204cc7c474437dda09f54c727ebe Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 21 Apr 2011 23:43:23 +0000 Subject: [PATCH] Use "wx" prefix for the GUIDs we (re)define in wxMSW code. CLSID_AutoComplete became ambiguous with MinGW because it does define it in its shlguid.h header (although MSVC/Platform SDK does not define this one) so use a "wx" prefix for it to avoid ambiguity. Also use the same prefix for the IID_IAutoCompleteDropDown value we define for consistency. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/textentry.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp index 0ccc7aacf1..3409106702 100644 --- a/src/msw/textentry.cpp +++ b/src/msw/textentry.cpp @@ -84,10 +84,10 @@ public: virtual HRESULT wxSTDCALL ResetEnumerator() = 0; }; -DEFINE_GUID(IID_IAutoCompleteDropDown, +DEFINE_GUID(wxIID_IAutoCompleteDropDown, 0x3cd141f4, 0x3c6a, 0x11d2, 0xbc, 0xaa, 0x00, 0xc0, 0x4f, 0xd9, 0x29, 0xdb); -DEFINE_GUID(CLSID_AutoComplete, +DEFINE_GUID(wxCLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); // Small helper class which can be used to ensure thread safety even when @@ -363,7 +363,7 @@ public: // apparently. HRESULT hr = CoCreateInstance ( - CLSID_AutoComplete, + wxCLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, IID_IAutoComplete, @@ -398,7 +398,7 @@ public: // provided IAutoComplete always implements IAutoCompleteDropDown too. hr = m_autoComplete->QueryInterface ( - IID_IAutoCompleteDropDown, + wxIID_IAutoCompleteDropDown, reinterpret_cast(&m_autoCompleteDropDown) ); if ( FAILED(hr) ) -- 2.45.2