From 3ebc8f4363959f7c4a19f839425ccfe95e2d6a75 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 12 May 2014 13:16:05 +0000 Subject: [PATCH] Don't use LCID and WXLCID interchangeably in wxMSW code. Similarly to the problem with WXDWORD and DWORD, LCID is actually an unsigned int and not unsigned long in 64 bit Cygwin builds, so it's a different type. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/ole/automtn.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp index 1c3bd0a2b9..cc3dda234b 100644 --- a/src/msw/ole/automtn.cpp +++ b/src/msw/ole/automtn.cpp @@ -600,12 +600,12 @@ bool wxAutomationObject::CreateInstance(const wxString& progId) const return m_dispatchPtr != NULL; } -LCID wxAutomationObject::GetLCID() const +WXLCID wxAutomationObject::GetLCID() const { return m_lcid; } -void wxAutomationObject::SetLCID(LCID lcid) +void wxAutomationObject::SetLCID(WXLCID lcid) { m_lcid = lcid; }