From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 26 Jul 2013 10:38:39 +0000 (+0000)
Subject: Fix duplicate symbol link errors in wxMSW wxTextEntry code.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/609a42decfea29a3f63444751c2ab025b75b886d?ds=inline

Fix duplicate symbol link errors in wxMSW wxTextEntry code.

Don't include <initguid.h> too soon, as this affects the headers included
after it instead of just our own uses of DEFINE_GUID() as intended.

This resulted in link errors because of duplicate definitions of the many
standard GUIDs when using MinGW for which we include, for whatever reason,
shlguid.h.

This fixes the change of r67573.

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

diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index a8a12a5c7f..b865051d74 100644
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -34,8 +34,6 @@
 #include "wx/textcompleter.h"
 #include "wx/dynlib.h"
 
-#include <initguid.h>
-
 #include "wx/msw/private.h"
 
 #if wxUSE_UXTHEME
@@ -79,6 +77,11 @@
     #define SHACF_FILESYS_DIRS 0x00000020
 #endif
 
+// This must be the last header included to only affect the DEFINE_GUID()
+// occurrences below but not any GUIDs declared in the standard files included
+// above.
+#include <initguid.h>
+
 namespace
 {