compilation fixes.

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

diff --git a/Makefile.in b/Makefile.in
index 8d1f613b019c36c48a58c55e7bfb5d9179acb8ed..21db9f2ddb0ccba5034cac21ce6799929bc1e700 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -881,6 +881,12 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
        cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
        
        cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
        cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
        

+       mkdir $(DISTDIR)/samples/rotate
+       cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
+       cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
+       cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
+       cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
+    

        mkdir $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit
        mkdir $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
        cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit

diff --git a/samples/configure b/samples/configure
index cb782ff5abfc4ce496a75824a768cabb4b5a6d67..d55867cfaba765c38ff4ac75c9d5a3aa88e77826 100755 (executable)
--- a/samples/configure
+++ b/samples/configure
@@ -2,7 +2,7 @@
 
 # From configure.in Id: configure.in
 # Guess values for system-dependent variables and create Makefiles.
 
 # From configure.in Id: configure.in
 # Guess values for system-dependent variables and create Makefiles.

-# Generated automatically using autoconf version 2.13 
+# Generated automatically using autoconf version 2.14 

 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation


@@ -334,7 +334,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)

-    echo "configure generated by autoconf version 2.13"
+    echo "configure generated by autoconf version 2.14"

     exit 0 ;;
 
   -with-* | --with-*)
     exit 0 ;;
 
   -with-* | --with-*)


@@ -625,7 +625,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)

-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    echo "$CONFIG_STATUS generated by autoconf version 2.14"

     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;


@@ -670,6 +670,7 @@ trap 'rm -fr `echo "
             propsize/Makefile
             richedit/Makefile
             resource/Makefile
             propsize/Makefile
             richedit/Makefile
             resource/Makefile

+            rotate/Makefile

             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile


@@ -799,6 +800,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             propsize/Makefile
             richedit/Makefile
             resource/Makefile
             propsize/Makefile
             richedit/Makefile
             resource/Makefile

+            rotate/Makefile

             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile

diff --git a/samples/configure.in b/samples/configure.in
index 3803a44d3e761dfe9bac44b6e6d55126296ad685..6d8561f9ffbc189c5231f8e7868986bcdf4065e2 100644 (file)
--- a/samples/configure.in
+++ b/samples/configure.in
@@ -38,6 +38,7 @@ AC_OUTPUT([
             propsize/Makefile
             richedit/Makefile
             resource/Makefile
             propsize/Makefile
             richedit/Makefile
             resource/Makefile

+            rotate/Makefile

             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile
             sashtest/Makefile
             scroll/Makefile
             scrollsub/Makefile

diff --git a/samples/rotate/rotate.cpp b/samples/rotate/rotate.cpp
index 74b3f80551f46984703bcbb0d93a4c567fdea020..df87c29685fb75686e1d301e936b9415682fd3cb 100644 (file)
--- a/samples/rotate/rotate.cpp
+++ b/samples/rotate/rotate.cpp
@@ -16,6 +16,10 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+

 #include "wx/image.h"
 
 class MyApp: public wxApp
 #include "wx/image.h"
 
 class MyApp: public wxApp

diff --git a/src/common/image.cpp b/src/common/image.cpp
index cbbf97b0bc2b2f1ad4d4532d978569b5b14a65af..ac99956336168c6860c3aa60937d1fdfe77ed2c0 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -2756,11 +2756,11 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
     wxRotationPoint p3 = rotated_point (img.GetWidth(), 0, cos_angle, sin_angle, p0);
     wxRotationPoint p4 = rotated_point (img.GetWidth(), img.GetHeight(), cos_angle, sin_angle, p0);
 
     wxRotationPoint p3 = rotated_point (img.GetWidth(), 0, cos_angle, sin_angle, p0);
     wxRotationPoint p4 = rotated_point (img.GetWidth(), img.GetHeight(), cos_angle, sin_angle, p0);
 

-    int x1 = floor (min (min(p1.x, p2.x), min(p3.x, p4.x)));
-    int y1 = floor (min (min(p1.y, p2.y), min(p3.y, p4.y)));
+    int x1 = floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
+    int y1 = floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));

 
 

-    int x2 = ceil (max (max(p1.x, p2.x), max(p3.x, p4.x)));
-    int y2 = ceil (max (max(p1.y, p2.y), max(p3.y, p4.y)));
+    int x2 = ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
+    int y2 = ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));

 
     wxImage rotated (x2 - x1 + 1, y2 - y1 + 1);
 
 
     wxImage rotated (x2 - x1 + 1, y2 - y1 + 1);