parent
9406cd8631
commit
c9e078fe3c
@ -1,19 +0,0 @@
|
||||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
diff -ur wxWidgets-2.9.5.orig/src/msw/textentry.cpp wxWidgets-2.9.5/src/msw/textentry.cpp
|
||||
--- wxWidgets-2.9.5.orig/src/msw/textentry.cpp 2013-07-28 20:06:55.000000000 +1000
|
||||
+++ wxWidgets-2.9.5/src/msw/textentry.cpp 2013-07-28 20:51:37.000000000 +1000
|
||||
@@ -34,7 +34,11 @@
|
||||
#include "wx/textcompleter.h"
|
||||
#include "wx/dynlib.h"
|
||||
|
||||
-#include <initguid.h>
|
||||
+#ifdef __MINGW64_VERSION_MAJOR
|
||||
+ #define DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) EXTERN_C const GUID DECLSPEC_SELECTANY name = { l,w1,w2,{ b1,b2,b3,b4,b5,b6,b7,b8 } }
|
||||
+#else
|
||||
+ #include <initguid.h>
|
||||
+#endif
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
|
@ -1,23 +0,0 @@
|
||||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
This patch has been taken from:
|
||||
http://thread.gmane.org/gmane.comp.lib.wxwidgets.general/79996/focus=80025
|
||||
|
||||
diff -ur wxWidgets-2.9.5.orig/src/msw/dirdlg.cpp wxWidgets-2.9.5/src/msw/dirdlg.cpp
|
||||
--- wxWidgets-2.9.5.orig/src/msw/dirdlg.cpp 2013-07-17 01:47:14.000000000 +1000
|
||||
+++ wxWidgets-2.9.5/src/msw/dirdlg.cpp 2013-10-19 23:19:10.000000000 +1100
|
||||
@@ -106,11 +106,11 @@
|
||||
#define FOS_FORCEFILESYSTEM 0x40
|
||||
#endif
|
||||
|
||||
-struct COMDLG_FILTERSPEC;
|
||||
+struct _COMDLG_FILTERSPEC;
|
||||
|
||||
struct IFileDialog : public IModalWindow
|
||||
{
|
||||
- virtual HRESULT wxSTDCALL SetFileTypes(UINT, const COMDLG_FILTERSPEC*) = 0;
|
||||
+ virtual HRESULT wxSTDCALL SetFileTypes(UINT, const _COMDLG_FILTERSPEC*) = 0;
|
||||
virtual HRESULT wxSTDCALL SetFileTypeIndex(UINT) = 0;
|
||||
virtual HRESULT wxSTDCALL GetFileTypeIndex(UINT*) = 0;
|
||||
virtual HRESULT wxSTDCALL Advise(IFileDialogEvents*, DWORD*) = 0;
|
Loading…
Reference in new issue