From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 5 Aug 2012 22:44:31 +0000 (+0000)
Subject: Fix wxAutomationObject compilation in PCH-less build.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/03a1d863523299d49b04ea9bdb78ddd54fefab2d

Fix wxAutomationObject compilation in PCH-less build.

Don't use LCID in a public header, windows.h might not be included. Use WXLCID
stand-in instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h
index 4f7ea97dd7..89eee6909c 100644
--- a/include/wx/msw/ole/automtn.h
+++ b/include/wx/msw/ole/automtn.h
@@ -21,6 +21,7 @@
 
 typedef void            WXIDISPATCH;
 typedef unsigned short* WXBSTR;
+typedef unsigned long   WXLCID;
 
 #ifdef GetObject
 #undef GetObject
@@ -109,17 +110,17 @@ public:
     // Returns the locale identifier used in automation calls. The default is
     // LOCALE_SYSTEM_DEFAULT. Objects obtained by GetObject() inherit the
     // locale identifier from the one that created them.
-    LCID GetLCID() const;
+    WXLCID GetLCID() const;
 
     // Sets the locale identifier to be used in automation calls performed by
     // this object. The default is LOCALE_SYSTEM_DEFAULT.
-    void SetLCID(LCID lcid);
+    void SetLCID(WXLCID lcid);
 
 public: // public for compatibility only, don't use m_dispatchPtr directly.
     WXIDISPATCH*  m_dispatchPtr;
 
 private:
-    LCID          m_lcid;
+    WXLCID m_lcid;
 
     wxDECLARE_NO_COPY_CLASS(wxAutomationObject);
 };