Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-02-06 17:13:14 +00:00
parent 6f434e5041
commit 46132182f0
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@@ -881,6 +881,12 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
cp $(SAMPDIR)/resource/*.wxr $(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 mkdir $(DISTDIR)/samples/richedit
cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit

8
samples/configure vendored
View File

@@ -2,7 +2,7 @@
# From configure.in Id: configure.in # From configure.in Id: configure.in
# Guess values for system-dependent variables and create Makefiles. # 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. # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
# #
# This configure script is free software; the Free Software Foundation # This configure script is free software; the Free Software Foundation
@@ -334,7 +334,7 @@ EOF
verbose=yes ;; verbose=yes ;;
-version | --version | --versio | --versi | --vers) -version | --version | --versio | --versi | --vers)
echo "configure generated by autoconf version 2.13" echo "configure generated by autoconf version 2.14"
exit 0 ;; exit 0 ;;
-with-* | --with-*) -with-* | --with-*)
@@ -625,7 +625,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" 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 ;; exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v) -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 ;; exit 0 ;;
-help | --help | --hel | --he | --h) -help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;; echo "\$ac_cs_usage"; exit 0 ;;
@@ -670,6 +670,7 @@ trap 'rm -fr `echo "
propsize/Makefile propsize/Makefile
richedit/Makefile richedit/Makefile
resource/Makefile resource/Makefile
rotate/Makefile
sashtest/Makefile sashtest/Makefile
scroll/Makefile scroll/Makefile
scrollsub/Makefile scrollsub/Makefile
@@ -799,6 +800,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
propsize/Makefile propsize/Makefile
richedit/Makefile richedit/Makefile
resource/Makefile resource/Makefile
rotate/Makefile
sashtest/Makefile sashtest/Makefile
scroll/Makefile scroll/Makefile
scrollsub/Makefile scrollsub/Makefile

1
samples/configure.in
View File

@@ -38,6 +38,7 @@ AC_OUTPUT([
propsize/Makefile propsize/Makefile
richedit/Makefile richedit/Makefile
resource/Makefile resource/Makefile
rotate/Makefile
sashtest/Makefile sashtest/Makefile
scroll/Makefile scroll/Makefile
scrollsub/Makefile scrollsub/Makefile

4
samples/rotate/rotate.cpp
View File

@@ -16,6 +16,10 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#include "wx/image.h" #include "wx/image.h"
class MyApp: public wxApp class MyApp: public wxApp

8
src/common/image.cpp
View File

@@ -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 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 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 x1 = floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
int y1 = floor (min (min(p1.y, p2.y), min(p3.y, p4.y))); 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 x2 = ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
int y2 = ceil (max (max(p1.y, p2.y), max(p3.y, p4.y))); 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);