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

Fix wxAutomationObject compilation in PCH-less build.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-08-05 22:44:31 +00:00
parent ef40bc3dae
commit 03a1d86352
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@
typedef void WXIDISPATCH; typedef void WXIDISPATCH;
typedef unsigned short* WXBSTR; typedef unsigned short* WXBSTR;
typedef unsigned long WXLCID;
#ifdef GetObject #ifdef GetObject
#undef GetObject #undef GetObject
@@ -109,17 +110,17 @@ public:
// Returns the locale identifier used in automation calls. The default is // Returns the locale identifier used in automation calls. The default is
// LOCALE_SYSTEM_DEFAULT. Objects obtained by GetObject() inherit the // LOCALE_SYSTEM_DEFAULT. Objects obtained by GetObject() inherit the
// locale identifier from the one that created them. // 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 // Sets the locale identifier to be used in automation calls performed by
// this object. The default is LOCALE_SYSTEM_DEFAULT. // 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. public: // public for compatibility only, don't use m_dispatchPtr directly.
WXIDISPATCH* m_dispatchPtr; WXIDISPATCH* m_dispatchPtr;
private: private:
LCID m_lcid; WXLCID m_lcid;
wxDECLARE_NO_COPY_CLASS(wxAutomationObject); wxDECLARE_NO_COPY_CLASS(wxAutomationObject);
}; };