Import r67258 of the wxWidgets trunk, which I expect will before

long become wxWidgets 2.9.2, which in turn is expected to be the
last 2.9 release before the 3.0 stable release.

Since the full wxWidgets distribution is rather large, I have
imported only the parts that we use, on a subdirectory basis:

art
include/wx/*.*
include/wx/aui
include/wx/cocoa
include/wx/generic
include/wx/gtk
include/wx/meta
include/wx/msw
include/wx/osx
include/wx/persist
include/wx/private
include/wx/protocol
include/wx/unix
src/aui
src/common
src/generic
src/gtk
src/msw
src/osx
src/unix


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7380 8ced0084-cf51-0410-be5f-012b33b47a6e

Externals/wxWidgets3/include/wx/msw/wrapgdip.h

@@ -0,0 +1,32 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/wrapgdip.h
+// Purpose:     wrapper around <gdiplus.h> header
+// Author:      Vadim Zeitlin
+// Created:     2007-03-15
+// RCS-ID:      $Id: wrapgdip.h 44815 2007-03-15 03:41:52Z VZ $
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_WRAPGDIP_H_
+#define _WX_MSW_WRAPGDIP_H_
+
+#include "wx/msw/wrapwin.h"
+
+// these macros must be defined before gdiplus.h is included but we explicitly
+// prevent windows.h from defining them in wx/msw/wrapwin.h as they conflict
+// with standard functions of the same name elsewhere, so we have to pay for it
+// by manually redefining them ourselves here
+#ifndef max
+    #define max(a,b)            (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef min
+    #define min(a,b)            (((a) < (b)) ? (a) : (b))
+#endif
+
+#include <gdiplus.h>
+using namespace Gdiplus;
+
+#endif // _WX_MSW_WRAPGDIP_H_
+