From: Robin Dunn <robin@alldunn.com>
Date: Wed, 11 Oct 2006 06:44:51 +0000 (+0000)
Subject: distrib changes to enable graphics context and add gdiplus.dll
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fa5a80d6a6c7b2d14b4bad3aed6546c7f65e6519

distrib changes to enable graphics context and add gdiplus.dll


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

diff --git a/wxPython/distrib/all/do-build-windows b/wxPython/distrib/all/do-build-windows
index 014c351219..2f3d1ec105 100755
--- a/wxPython/distrib/all/do-build-windows
+++ b/wxPython/distrib/all/do-build-windows
@@ -83,6 +83,7 @@ s/wxUSE_AFM_FOR_POSTSCRIPT *1/wxUSE_AFM_FOR_POSTSCRIPT 0/g
 s/wxUSE_DISPLAY *0/wxUSE_DISPLAY 1/g
 s/wxUSE_DIB_FOR_BITMAP *0/wxUSE_DIB_FOR_BITMAP 1/g
 s/wxUSE_DEBUGREPORT *1/wxUSE_DEBUGREPORT 0/g
+s/wxUSE_GRAPHICS_CONTEXT *0/wxUSE_GRAPHICS_CONTEXT 1/g
 EOF
 cat $WXDIR/include/wx/msw/setup0.h | sed -f .my.sedexpr > $WXDIR/include/wx/msw/setup.h
 rm .my.sedexpr
@@ -90,10 +91,10 @@ rm .my.sedexpr
 
 echo "Building the wx DLLs..."
 if [ $CHARTYPE = both -o $CHARTYPE = ansi ]; then
-    .make hybrid
+    .make hybrid USE_GDIPLUS=1
 fi
 if [ $CHARTYPE = both -o $CHARTYPE = unicode ]; then
-    .make hybrid-uni
+    .make hybrid-uni USE_GDIPLUS=1
 fi
 
 
diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build
index f05c29b41d..fd8379c853 100755
--- a/wxPython/distrib/mac/wxPythonOSX/build
+++ b/wxPython/distrib/mac/wxPythonOSX/build
@@ -257,6 +257,7 @@ if [ $skipconfig != yes -a $universal != yes ]; then
 	--enable-sound \
 	--enable-display \
 	--enable-geometry \
+	--enable-graphics_ctx \
 	$DEBUG_FLAG \
 	--enable-precomp=no \
 	--enable-optimise \
diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 5e063974b1..62f680bac7 100644
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -75,6 +75,7 @@ Name: pthfile;  Description: "Make this install be the default wxPython"; Types:
 
 [Files]
 %(RTDLL)s
+Source: "distrib\msw\gdiplus.dll"; DestDir: "{code:GetPythonDir}"; OnlyBelowVersion: 5.1; CopyMode: alwaysskipifsameorolder; Flags: sharedfile; Components: core
 Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll";  DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 %(MSLU)s
 
diff --git a/wxPython/distrib/make_installer_inno4.py b/wxPython/distrib/make_installer_inno4.py
index 395ae0db6c..0498f78df2 100755
--- a/wxPython/distrib/make_installer_inno4.py
+++ b/wxPython/distrib/make_installer_inno4.py
@@ -79,6 +79,7 @@ Name: pthfile;  Description: "Make this install be the default wxPython"; Types:
 
 [Files]
 %(RTDLL)s
+Source: "distrib\msw\gdiplus.dll"; DestDir: "{code:GetPythonDir}"; OnlyBelowVersion: 5.1; CopyMode: alwaysskipifsameorolder; Flags: sharedfile; Components: core
 Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll";  DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 %(MSLU)s
 
diff --git a/wxPython/distrib/msw/gdiplus.dll b/wxPython/distrib/msw/gdiplus.dll
new file mode 100644
index 0000000000..7d53c44f1f
Binary files /dev/null and b/wxPython/distrib/msw/gdiplus.dll differ
diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index a4117823bd..d794c60bee 100644
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -210,6 +210,7 @@ cd bld
 	--with-opengl \
 	--with-gnomeprint \
 	--enable-geometry \
+	--enable-graphics_ctx \
 	--enable-optimise \
 	--enable-sound 	--with-sdl \
 %if %{mediactrl}