Hi,
I use MinGW to build wxWidgets for the PPMs I support.
You need - MinGW (obviously).
All I did to get this was download the installer from MinGW page.
As I recall, you have to run the installer again from its installed location to
get the latest versions of everything - but I could be imagining this.
'patch' from GnuWin32 project.
Then create a .bat file to set up your environment. I set up my PATH, INCLUDE
and LIB dirs from scratch. I know it shouldn't matter for MinGW but I trust
nothing and don't want to end up picking up headers from the multitude of SDK's
and PDKs I have installed.
Download wxWidgets 2.8.7 from
http://biolpc22.york.ac.uk/pub/2.8.7/wxMSW-2.8.7.zip
put the attached patch in the head directory of extracted wxwidgets.
cd <path to wxwidgets>
patch -lNp0 --input=wxwidgets.patch
cd build\msw
mingw32-make makefile.gcc
cd ..\..\contrib\build\stc
mingw32-make makefile.gcc
That is it.
This builds you a Unicode wxWidgets (without wxGraphicsContext support)
The patch file is just an aggregation of the patches that Alien::wxWidgets
provides.
To build Alien::wxWidgets
set WXDIR=<path to wxwidgets>
set WXWIN=%WXDIR%
perl Build.PL --build_wx=0 --unicode=1 --mslu=0
perl Build
perl Build test
perl Build install
To build Wx
perl Makefile.PL --wx-unicode --no-wx-mslu
dmake
dmake test
dmake install
All should work.
I think the best place for a 'HOWTO' would be at the wxperl.sourceforge.net
site. I'm quite sure if you create one Mattia would be happy to include it in
the documents / tutorials section.
Including wxGraphicsContext is a mini HOWTO all of its own. There are several
links about the net to downloadable gdiplus headers for MinGW. I have no idea
if these work - but probably not. You need the gdiplus headers from the latest
platform SDK, make a few amendments (You can google for these on 'MinGW
gdiplus'. You want the amendments suggested, but not the downloadable headers)
You also need the import lib from the Platform SDK.
Which means ------ you need the Platform SDK (yes, all of it) so you can get
the gdiplus headers and the import lib.
Deep joy.
Regards
Mark
Harvey Platter wrote:
> Thanks for your help, Mark. Unfortunately, I couldn't get wxWidgets to
> compile with the MinGW32 kit, there seemed to be a lot of broken links
> to include files.
>
> I'm now trying with wxPack and, if you like, I'll let you know how that
> proceeds.
>
> I'm putting together an internal Wiki page on setting up for wxPerl
> development on Windows. If you could advise me on a suitable location to
> post it to, I'd be happy to make it available to the community, once
> I've got a bulletproof method worked out.
>
> Best regards
>
> Harvey
>
>
> Mark Dootson wrote:
>> Either
>>
>> 1)
>>
>> use ActivePerl 822 - no install of ExtUtils::FakeConfig needed - this
>> is the easiest way.
>>
>> or
>>
>> 2)
>>
>> use NMAKE to install ExtUtils::FakeConfig in earlier ActivePerl versions.
>> Google for NMAKE15.exe - the Microsoft download page will be one of
>> the first results.
>>
>> dmake fails to build ExtUtils::FakeConfig.
>>
>> or
>>
>> 3)
>> take a look at the source for implib_mingw and call it yourself
>> directly to create libperl58.a
>>
>>
>>
>> Regards
>>
>> Mark
>>
>>
>>
>>
>> Harvey Platter wrote:
>>
>>> I'm trying to install for MinGW32 and ActivePerl but building the Fake
>>> Config fails...
>>>
>>> dmake install
>>> dmake: Error: -- `implib_mingw' not found, and can't be made
>>>
>>> Does anyone have a fix / workaround? The only mention I can find of this
>>> problem is a reference for Vanilla Perl, would it be worth trying to
>>> build this as an alternative to ActivePerl?
>>>
>>> If not, what would be your recommendation for an alternative to
>>> ActivePerl on Windows?
>>>
>>> Regards
>>>
>>> Harvey
>>>
>>>
>>
>>
>>
>>
diff -rwu pure/build/msw/config.gcc unicode/build/msw/config.gcc
--- build/msw/config.gcc 2007-08-17 09:28:16.000000000 +0100
+++ build/msw/config.gcc 2007-11-12 18:06:36.984375000 +0000
@@ -23,28 +23,28 @@
CXXFLAGS :=
# Standard preprocessor flags (common for CC and CXX)
-CPPFLAGS :=
+CPPFLAGS :=
# Standard linker flags
-LDFLAGS :=
+LDFLAGS :=
# The C preprocessor
CPP := $(CC) -E
# What type of library to build? [0,1]
-SHARED := 0
+SHARED := 1
# Build wxUniversal instead of native port? [0,1]
WXUNIV := 0
# Compile Unicode build of wxWidgets? [0,1]
-UNICODE := 0
+UNICODE := 1
# Use MSLU library when building Unicode version. [0,1]
MSLU := 0
# Type of compiled binaries [debug,release]
-BUILD := debug
+BUILD := release
# Should debugging info be included in the executables? The default value
# "default" means that debug info will be included if BUILD=debug
@@ -77,13 +77,13 @@
USE_RICHTEXT := 1
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
-USE_OPENGL := 0
+USE_OPENGL := 1
# Build ODBC database classes (USE_GUI must be 1)? [0,1]
USE_ODBC := 0
# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
-USE_QA := 0
+USE_QA := 0
# Enable exceptions in compiled code. [0,1]
USE_EXCEPTIONS := 1
@@ -95,13 +95,13 @@
USE_THREADS := 1
# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set
wxUSE_GRAPHICS_CONTEXT) [0,1]
-USE_GDIPLUS := 0
+USE_GDIPLUS := 0
# Is this official build by wxWidgets developers? [0,1]
OFFICIAL_BUILD := 0
# Use this to name your customized DLLs differently
-VENDOR := custom
+VENDOR := custom
#
WX_FLAVOUR :=
diff -rwu pure/build/msw/config.vc unicode/build/msw/config.vc
--- build/msw/config.vc 2007-08-17 09:28:16.000000000 +0100
+++ build/msw/config.vc 2007-11-12 18:02:17.218750000 +0000
@@ -32,19 +32,19 @@
CPP = $(CC) /EP /nologo
# What type of library to build? [0,1]
-SHARED = 0
+SHARED = 1
# Build wxUniversal instead of native port? [0,1]
WXUNIV = 0
# Compile Unicode build of wxWidgets? [0,1]
-UNICODE = 0
+UNICODE = 1
# Use MSLU library when building Unicode version. [0,1]
MSLU = 0
# Type of compiled binaries [debug,release]
-BUILD = debug
+BUILD = release
# The target processor architecture must be specified when it is not X86.
# This does not affect the compiler output, so you still need to make sure
@@ -90,7 +90,7 @@
USE_RICHTEXT = 1
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
-USE_OPENGL = 0
+USE_OPENGL = 1
# Build ODBC database classes (USE_GUI must be 1)? [0,1]
USE_ODBC = 0
@@ -108,13 +108,13 @@
USE_THREADS = 1
# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set
wxUSE_GRAPHICS_CONTEXT) [0,1]
-USE_GDIPLUS = 0
+USE_GDIPLUS = 0
# Is this official build by wxWidgets developers? [0,1]
OFFICIAL_BUILD = 0
# Use this to name your customized DLLs differently
-VENDOR = custom
+VENDOR = custom
#
WX_FLAVOUR =
diff -rwu pure/build/msw/makefile.gcc unicode/build/msw/makefile.gcc
--- build/msw/makefile.gcc 2007-11-09 14:16:22.000000000 +0000
+++ build/msw/makefile.gcc 2007-11-12 18:02:17.281250000 +0000
@@ -173,14 +173,14 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DwxUSE_BASE=1 -DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS)
MONODLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -294,14 +294,14 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib -DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -414,14 +414,14 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
BASEDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 \
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
@@ -521,14 +521,14 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -626,7 +626,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -649,7 +649,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
$(CPPFLAGS) $(CXXFLAGS)
@@ -671,7 +671,7 @@
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 \
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
@@ -691,7 +691,7 @@
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib -DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -709,7 +709,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DWXUSINGDLL -DWXMAKINGDLL_ADV $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -721,7 +721,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
$(CXXFLAGS)
@@ -732,7 +732,7 @@
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_MEDIA $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -748,7 +748,7 @@
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -763,7 +763,7 @@
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC \
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
@@ -777,7 +777,7 @@
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -789,7 +789,7 @@
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_DBGRID $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -801,7 +801,7 @@
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -812,7 +812,7 @@
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_HTML $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -847,7 +847,7 @@
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -881,7 +881,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DWXUSINGDLL -DWXMAKINGDLL_QA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -894,7 +894,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
$(CXXFLAGS)
@@ -906,7 +906,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -919,7 +919,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
$(CPPFLAGS) $(CXXFLAGS)
@@ -931,7 +931,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DWXUSINGDLL -DWXMAKINGDLL_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -998,7 +998,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
$(CXXFLAGS)
@@ -1064,7 +1064,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DWXUSINGDLL -DWXMAKINGDLL_AUI $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -1080,7 +1080,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
$(CXXFLAGS)
@@ -1095,7 +1095,7 @@
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT $(__RTTIFLAG)
\
$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -1115,7 +1115,7 @@
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
- $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall
-I..\..\src\tiff \
+ $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -Wall
-I..\..\src\tiff \
-I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
-I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -1134,7 +1134,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
-DWXUSINGDLL -DWXMAKINGDLL_GL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
@@ -1146,7 +1146,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\include -W -Wall -I..\..\src\tiff
-I..\..\src\jpeg \
+ -I$(SETUPHDIR) -I..\..\include -Wall -I..\..\src\tiff -I..\..\src\jpeg \
-I..\..\src\png -I..\..\src\zlib -I..\..\src\regex
-I..\..\src\expat\lib \
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
$(CXXFLAGS)
diff -rwu pure/contrib/build/stc/makefile.gcc
unicode/contrib/build/stc/makefile.gcc
--- contrib/build/stc/makefile.gcc 2007-08-30 14:38:30.000000000 +0100
+++ contrib/build/stc/makefile.gcc 2007-11-12 18:02:17.312500000 +0000
@@ -23,7 +23,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\src\stc\..\..\..\include -W -Wall \
+ -I$(SETUPHDIR) -I..\..\src\stc\..\..\..\include -Wall \
-I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
-DWXUSINGDLL -DWXMAKINGDLL_STC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
@@ -118,7 +118,7 @@
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \
- -I$(SETUPHDIR) -I..\..\src\stc\..\..\..\include -W -Wall \
+ -I$(SETUPHDIR) -I..\..\src\stc\..\..\..\include -Wall \
-I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
diff -rwu pure/include/wx/msw/setup.h unicode/include/wx/msw/setup.h
--- include/wx/msw/setup.h 2007-08-06 16:40:50.000000000 +0100
+++ include/wx/msw/setup.h 2007-11-12 18:02:17.343750000 +0000
@@ -43,7 +43,7 @@
// in the version after it completely.
//
// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 1
+#define WXWIN_COMPATIBILITY_2_6 0
// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
// default system font is used for wxWindow::GetCharWidth/Height() instead of
@@ -157,7 +157,7 @@
//
// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
#ifndef wxUSE_UNICODE
- #define wxUSE_UNICODE 0
+ #define wxUSE_UNICODE 1
#endif
// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
@@ -335,7 +335,7 @@
// Default is 1
//
// Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME 1
+#define wxUSE_FSVOLUME 0
// Use wxStandardPaths class which allows to retrieve some standard locations
// in the file system
@@ -444,7 +444,7 @@
#define wxUSE_FS_ARCHIVE 1
// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET 1
+#define wxUSE_FS_INET 0
// wxArchive classes for accessing archives such as zip and tar
#define wxUSE_ARCHIVE_STREAMS 1
@@ -487,8 +487,8 @@
// The settings for the individual URL schemes
#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
+#define wxUSE_PROTOCOL_FTP 0
+#define wxUSE_PROTOCOL_HTTP 0
// Define this to use wxURL class.
#define wxUSE_URL 1
@@ -576,7 +576,7 @@
//
// Recommended setting: 1
#ifndef wxUSE_GRAPHICS_CONTEXT
-#define wxUSE_GRAPHICS_CONTEXT 0
+#define wxUSE_GRAPHICS_CONTEXT 0
#endif
// ----------------------------------------------------------------------------
@@ -991,7 +991,7 @@
// Default is 0.
//
// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
-#define wxUSE_GLCANVAS 0
+#define wxUSE_GLCANVAS 1
// wxRichTextCtrl allows editing of styled text.
//
@@ -1052,7 +1052,7 @@
#define wxUSE_DRAGIMAGE 1
-#define wxUSE_IPC 1
+#define wxUSE_IPC 0
// 0 for no interprocess comms
#define wxUSE_HELP 1
// 0 for no help facility
@@ -1173,7 +1173,7 @@
#define wxUSE_PCX 1
// Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF 0
+#define wxUSE_IFF 1
// Set to 1 for XPM format support
#define wxUSE_XPM 1
diff -rwu pure/src/generic/grid.cpp unicode/src/generic/grid.cpp
--- src/generic/grid.cpp 2007-08-06 16:37:42.000000000 +0100
+++ src/generic/grid.cpp 2007-11-12 18:02:17.406250000 +0000
@@ -8113,7 +8113,7 @@
break;
}
- if ( textOrientation == wxHORIZONTAL )
+ if ( textOrientation != wxVERTICAL )
{
dc.DrawText( line, x, y );
y += lineHeight;
diff -rwu pure/src/msw/graphics.cpp unicode/src/msw/graphics.cpp
--- src/msw/graphics.cpp 2007-11-09 14:16:00.000000000 +0000
+++ src/msw/graphics.cpp 2007-11-12 18:07:41.515625000 +0000
@@ -706,7 +706,7 @@
void wxGDIPlusPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, double
startAngle, double endAngle, bool clockwise )
{
double sweepAngle = endAngle - startAngle ;
- if( abs(sweepAngle) >= 2*M_PI)
+ if( fabs(sweepAngle) >= 2*M_PI)
{
sweepAngle = 2 * M_PI;
}
