Put the tagged wxPython dir under the tagged wxWidgets dir so it has the

same structure as needed for the tarballs



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy-2.8.4.2@47983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Makefile.in

@@ -70,7 +70,7 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 2.8
 WX_RELEASE_NODOT = 28
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(wx_top_builddir)/lib
 WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
 	$(CPPFLAGS) $(CFLAGS)
@@ -1621,6 +1621,8 @@ COND_TOOLKIT__BASE_MACOSX_HDR =  \
 	wx/unix/private.h \
 	wx/unix/stackwalk.h \
 	wx/unix/stdpaths.h \
+	wx/mac/corefoundation/cfdataref.h \
+	wx/mac/corefoundation/cfref.h \
 	wx/mac/corefoundation/cfstring.h \
 	wx/mac/corefoundation/hid.h \
 	wx/mac/corefoundation/stdpaths.h
@@ -1634,6 +1636,8 @@ COND_TOOLKIT_COCOA_BASE_MACOSX_HDR =  \
 	wx/unix/private.h \
 	wx/unix/stackwalk.h \
 	wx/unix/stdpaths.h \
+	wx/mac/corefoundation/cfdataref.h \
+	wx/mac/corefoundation/cfref.h \
 	wx/mac/corefoundation/cfstring.h \
 	wx/mac/corefoundation/hid.h \
 	wx/mac/corefoundation/stdpaths.h
@@ -1647,11 +1651,15 @@ COND_TOOLKIT_GTK_BASE_MACOSX_HDR =  \
 	wx/unix/private.h \
 	wx/unix/stackwalk.h \
 	wx/unix/stdpaths.h \
+	wx/mac/corefoundation/cfdataref.h \
+	wx/mac/corefoundation/cfref.h \
 	wx/mac/corefoundation/cfstring.h \
 	wx/mac/corefoundation/hid.h \
 	wx/mac/corefoundation/stdpaths.h
 @COND_TOOLKIT_GTK@BASE_MACOSX_HDR = $(COND_TOOLKIT_GTK_BASE_MACOSX_HDR)
 COND_TOOLKIT_MAC_BASE_MACOSX_HDR =  \
+	wx/mac/corefoundation/cfdataref.h \
+	wx/mac/corefoundation/cfref.h \
 	wx/mac/corefoundation/cfstring.h \
 	wx/mac/corefoundation/hid.h \
 	wx/mac/corefoundation/stdpaths.h \
@@ -1668,6 +1676,8 @@ COND_TOOLKIT_MOTIF_BASE_MACOSX_HDR =  \
 	wx/unix/private.h \
 	wx/unix/stackwalk.h \
 	wx/unix/stdpaths.h \
+	wx/mac/corefoundation/cfdataref.h \
+	wx/mac/corefoundation/cfref.h \
 	wx/mac/corefoundation/cfstring.h \
 	wx/mac/corefoundation/hid.h \
 	wx/mac/corefoundation/stdpaths.h
@@ -1681,6 +1691,8 @@ COND_TOOLKIT_X11_BASE_MACOSX_HDR =  \
 	wx/unix/private.h \
 	wx/unix/stackwalk.h \
 	wx/unix/stdpaths.h \
+	wx/mac/corefoundation/cfdataref.h \
+	wx/mac/corefoundation/cfref.h \
 	wx/mac/corefoundation/cfstring.h \
 	wx/mac/corefoundation/hid.h \
 	wx/mac/corefoundation/stdpaths.h
@@ -2818,6 +2830,7 @@ COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS =  \
 	wx/univ/stdrend.h \
 	wx/univ/textctrl.h \
 	wx/univ/theme.h \
+	wx/univ/tglbtn.h \
 	wx/univ/toolbar.h \
 	wx/univ/toplevel.h \
 	wx/univ/window.h
@@ -4556,9 +4569,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
 	monodll_tbarwce.o \
 	monodll_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS)
-@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS = \
+COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS =  \
-@COND_PLATFORM_MACOSX_1@	monodll_webkit.o monodll_fontdlgosx.o \
+	monodll_webkit.o \
-@COND_PLATFORM_MACOSX_1@	monodll_colordlgosx.o
+	monodll_fontdlgosx.o \
+	monodll_colordlgosx.o \
+	monodll_utilscocoa.o
+@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
 @COND_TOOLKIT_COCOA@	monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 =  \
@@ -6338,9 +6354,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
 	monolib_tbarwce.o \
 	monolib_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1)
-@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_1 = \
+COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_1 =  \
-@COND_PLATFORM_MACOSX_1@	monolib_webkit.o monolib_fontdlgosx.o \
+	monolib_webkit.o \
-@COND_PLATFORM_MACOSX_1@	monolib_colordlgosx.o
+	monolib_fontdlgosx.o \
+	monolib_colordlgosx.o \
+	monolib_utilscocoa.o
+@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_1)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
 @COND_TOOLKIT_COCOA@	monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 =  \
@@ -8349,9 +8368,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
 	coredll_tbarwce.o \
 	coredll_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2)
-@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_2 = \
+COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_2 =  \
-@COND_PLATFORM_MACOSX_1@	coredll_webkit.o coredll_fontdlgosx.o \
+	coredll_webkit.o \
-@COND_PLATFORM_MACOSX_1@	coredll_colordlgosx.o
+	coredll_fontdlgosx.o \
+	coredll_colordlgosx.o \
+	coredll_utilscocoa.o
+@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_2)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
 @COND_TOOLKIT_COCOA@	coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 =  \
@@ -9804,9 +9826,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
 	corelib_tbarwce.o \
 	corelib_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3)
-@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_3 = \
+COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_3 =  \
-@COND_PLATFORM_MACOSX_1@	corelib_webkit.o corelib_fontdlgosx.o \
+	corelib_webkit.o \
-@COND_PLATFORM_MACOSX_1@	corelib_colordlgosx.o
+	corelib_fontdlgosx.o \
+	corelib_colordlgosx.o \
+	corelib_utilscocoa.o
+@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_3)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
 @COND_TOOLKIT_COCOA@	corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
 COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 =  \
@@ -12907,6 +12932,9 @@ monodll_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(MONODLL_ODEP)
 monodll_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/colordlgosx.mm
 
+monodll_utilscocoa.o: $(srcdir)/src/mac/carbon/utilscocoa.mm $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/utilscocoa.mm
+
 monodll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
 
@@ -13528,8 +13556,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/motif/utils.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/cocoa/utils.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/cocoa/utils.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/utils.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/utils.mm
 
 @COND_PLATFORM_WIN32_1@monodll_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
@@ -17026,6 +17054,9 @@ monolib_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(MONOLIB_ODEP)
 monolib_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/colordlgosx.mm
 
+monolib_utilscocoa.o: $(srcdir)/src/mac/carbon/utilscocoa.mm $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/utilscocoa.mm
+
 monolib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
 
@@ -17647,8 +17678,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/motif/utils.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/cocoa/utils.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/cocoa/utils.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/utils.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/utils.mm
 
 @COND_PLATFORM_WIN32_1@monolib_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
@@ -22144,6 +22175,9 @@ coredll_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(COREDLL_ODEP)
 coredll_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/colordlgosx.mm
 
+coredll_utilscocoa.o: $(srcdir)/src/mac/carbon/utilscocoa.mm $(COREDLL_ODEP)
+	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/utilscocoa.mm
+
 coredll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
 
@@ -22288,8 +22322,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_utils.o: $(srcdir)/src/motif/utils.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_utils.o: $(srcdir)/src/cocoa/utils.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_utils.o: $(srcdir)/src/cocoa/utils.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/utils.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/utils.mm
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
@@ -25099,6 +25133,9 @@ corelib_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(CORELIB_ODEP)
 corelib_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/colordlgosx.mm
 
+corelib_utilscocoa.o: $(srcdir)/src/mac/carbon/utilscocoa.mm $(CORELIB_ODEP)
+	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/utilscocoa.mm
+
 corelib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
 
@@ -25243,8 +25280,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_utils.o: $(srcdir)/src/motif/utils.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_utils.o: $(srcdir)/src/cocoa/utils.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_utils.o: $(srcdir)/src/cocoa/utils.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/utils.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/utils.mm
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp

acinclude.m4

@@ -132,7 +132,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
 
-    AC_CHECK_HEADER(iostream,,, [ ])
+    AC_CHECK_HEADERS(iostream,,, [ ])
 
     if test "$ac_cv_header_iostream" = "yes" ; then
       ifelse([$1], , :, [$1])

build/autoconf_prepend-include/Makefile

@@ -0,0 +1,26 @@
+# Created: 2005/03/12
+# Author: David Elliott
+
+# For autoconf: Debian in their infinite wisdom decided to improve upon
+# the standard autoconf 2.59 macros. Thus Debian's autoconf generates
+# a totally different configure script.  This fixes it to look
+# mostly like Debian's.  There are also some fixes pulled in from the OS/2
+# fork of autoconf.
+
+# Rule to freeze the m4 so autoconf will actually use it.
+# NOTE: VERY important to cd to somewhere there are no .m4 files.
+# or at least no aclocal.m4 or else autom4te helpfully picks it up.
+.PHONY: all
+all: autoconf/autoconf.m4f
+
+AUTOCONF_SOURCES = \
+  autoconf/c.m4 \
+  autoconf/general.m4 \
+  autoconf/libs.m4 \
+  autoconf/status.m4
+
+AUTOM4TE=autom4te
+
+autoconf/autoconf.m4f: $(AUTOCONF_SOURCES)
+	$(AUTOM4TE) -B . --language=Autoconf --freeze --output=autoconf/autoconf.m4f
+

build/autoconf_prepend-include/README.txt

@@ -0,0 +1,22 @@
+wxAutohacks
+
+wxAutohacks is a way of ensuring the configure script remains consistent
+between developer commits.  Previous releases include a build/aclocal_include
+which has now been moved into the wxWidgets build/aclocal directory.
+
+At the moment, it is intended to be copied and or symlinked into a wxWidgets
+source tree.  For example, assume you have wxWidgets checked out in the
+/home/myname/wxCVS/wxWidgets/ path.  Then from /home/myname/wxCVS do this:
+cvs -d :pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout wxAutohacks
+
+You will now have wxAutohacks in /home/myname/wxCVS/wxAutohacks/.  Now go into
+the wxWidgets build (/home/myname/wxCVS/wxWidgets/build/) and do this:
+ln -s ../../wxAutohacks/build/autoconf_prepend-include .
+
+From now on from the root of your wxWidgets source tree when you do this:
+make -f build/autogen.mk
+you will also build an autoconf.m4f file which will ensure the configure
+script stays consistent.
+
+Alternatively you can do this:
+make -f build/autogen.mk AUTOHACKS_PREPEND_INCLUDE_DIR=../wxAutohacks/build/autoconf_prepend-include

build/autoconf_prepend-include/autoconf/libs.m4

@@ -0,0 +1,498 @@
+# This file is part of Autoconf.                       -*- Autoconf -*-
+# Checking for libraries.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception, the Free Software Foundation gives unlimited
+# permission to copy, distribute and modify the configure scripts that
+# are the output of Autoconf.  You need not follow the terms of the GNU
+# General Public License when using or distributing such scripts, even
+# though portions of the text of Autoconf appear in them.  The GNU
+# General Public License (GPL) does govern all other use of the material
+# that constitutes the Autoconf program.
+#
+# Certain portions of the Autoconf source text are designed to be copied
+# (in certain cases, depending on the input) into the output of
+# Autoconf.  We call these the "data" portions.  The rest of the Autoconf
+# source text consists of comments plus executable code that decides which
+# of the data portions to output in any given case.  We call these
+# comments and executable code the "non-data" portions.  Autoconf never
+# copies any of the non-data portions into its output.
+#
+# This special exception to the GPL applies to versions of Autoconf
+# released by the Free Software Foundation.  When you make and
+# distribute a modified version of Autoconf, you may extend this special
+# exception to the GPL to apply to your modified version as well, *unless*
+# your modified version has the potential to copy into its output some
+# of the text that was the non-data portion of the version that you started
+# with.  (In other words, unless your change moves or copies text from
+# the non-data portions to the data portions.)  If your modification has
+# such potential, you must delete any notice of this special exception
+# to the GPL from your modified version.
+#
+# Written by David MacKenzie, with help from
+# Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor,
+# Roland McGrath, Noah Friedman, david d zuhn, and many others.
+
+# Table of contents
+#
+# 1. Generic tests for libraries
+# 2. Tests for specific libraries
+
+
+## --------------------------------- ##
+## 1. Generic tests for libraries.## ##
+## --------------------------------- ##
+
+
+
+# AC_SEARCH_LIBS(FUNCTION, SEARCH-LIBS,
+#                [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
+#                [OTHER-LIBRARIES])
+# --------------------------------------------------------
+# Search for a library defining FUNC, if it's not already available.
+AC_DEFUN([AC_SEARCH_LIBS],
+[AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
+[ac_func_search_save_LIBS=$LIBS
+ac_cv_search_$1=no
+AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
+	       [ac_cv_search_$1="none required"])
+if test "$ac_cv_search_$1" = no; then
+  for ac_lib in $2; do
+    LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
+    AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
+		   [ac_cv_search_$1="-l$ac_lib"
+break])
+  done
+fi
+LIBS=$ac_func_search_save_LIBS])
+AS_IF([test "$ac_cv_search_$1" != no],
+  [test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
+  $3],
+      [$4])dnl
+])
+
+
+
+# AC_CHECK_LIB(LIBRARY, FUNCTION,
+#              [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
+#              [OTHER-LIBRARIES])
+# ------------------------------------------------------
+#
+# Use a cache variable name containing both the library and function name,
+# because the test really is for library $1 defining function $2, not
+# just for library $1.  Separate tests with the same $1 and different $2s
+# may have different results.
+#
+# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])
+# is asking for troubles, since AC_CHECK_LIB($lib, fun) would give
+# ac_cv_lib_$lib_fun, which is definitely not what was meant.  Hence
+# the AS_LITERAL_IF indirection.
+#
+# FIXME: This macro is extremely suspicious.  It DEFINEs unconditionally,
+# whatever the FUNCTION, in addition to not being a *S macro.  Note
+# that the cache does depend upon the function we are looking for.
+#
+# It is on purpose we used `ac_check_lib_save_LIBS' and not just
+# `ac_save_LIBS': there are many macros which don't want to see `LIBS'
+# changed but still want to use AC_CHECK_LIB, so they save `LIBS'.
+# And ``ac_save_LIBS' is too tempting a name, so let's leave them some
+# freedom.
+AC_DEFUN([AC_CHECK_LIB],
+[m4_ifval([$3], , [AH_CHECK_LIB([$1])])dnl
+AS_LITERAL_IF([$1],
+	      [AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])],
+	      [AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1''_$2])])dnl
+AC_CACHE_CHECK([for $2 in -l$1], ac_Lib,
+[ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$1 $5 $LIBS"
+AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
+	       [AS_VAR_SET(ac_Lib, yes)],
+	       [AS_VAR_SET(ac_Lib, no)])
+LIBS=$ac_check_lib_save_LIBS])
+AS_IF([test AS_VAR_GET(ac_Lib) = yes],
+      [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
+  LIBS="-l$1 $LIBS"
+])],
+      [$4])dnl
+AS_VAR_POPDEF([ac_Lib])dnl
+])# AC_CHECK_LIB
+
+
+# AH_CHECK_LIB(LIBNAME)
+# ---------------------
+m4_define([AH_CHECK_LIB],
+[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
+	     [Define to 1 if you have the `]$1[' library (-l]$1[).])])
+
+
+# AC_HAVE_LIBRARY(LIBRARY,
+#                 [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
+#                 [OTHER-LIBRARIES])
+# ---------------------------------------------------------
+#
+# This macro is equivalent to calling `AC_CHECK_LIB' with a FUNCTION
+# argument of `main'.  In addition, LIBRARY can be written as any of
+# `foo', `-lfoo', or `libfoo.a'.  In all of those cases, the compiler
+# is passed `-lfoo'.  However, LIBRARY cannot be a shell variable;
+# it must be a literal name.
+AU_DEFUN([AC_HAVE_LIBRARY],
+[m4_pushdef([AC_Lib_Name],
+	    m4_bpatsubst(m4_bpatsubst([[$1]],
+				    [lib\([^\.]*\)\.a], [\1]),
+			[-l], []))dnl
+AC_CHECK_LIB(AC_Lib_Name, main, [$2], [$3], [$4])dnl
+ac_cv_lib_[]AC_Lib_Name()=ac_cv_lib_[]AC_Lib_Name()_main
+m4_popdef([AC_Lib_Name])dnl
+])
+
+
+
+
+## --------------------------------- ##
+## 2. Tests for specific libraries.  ##
+## --------------------------------- ##
+
+
+
+# --------------------- #
+# Checks for X window.  #
+# --------------------- #
+
+
+# _AC_PATH_X_XMKMF
+# ----------------
+# Internal subroutine of _AC_PATH_X.
+# Set ac_x_includes and/or ac_x_libraries.
+m4_define([_AC_PATH_X_XMKMF],
+[rm -fr conftest.dir
+if mkdir conftest.dir; then
+  cd conftest.dir
+  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+  cat >Imakefile <<'_ACEOF'
+acfindx:
+	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+_ACEOF
+  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+    for ac_extension in a so sl; do
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+	 test -f $ac_im_libdir/libX11.$ac_extension; then
+	ac_im_usrlibdir=$ac_im_libdir; break
+      fi
+    done
+    # Screen out bogus values from the imake configuration.  They are
+    # bogus both because they are the default anyway, and because
+    # using them would break gcc on systems where it needs fixed includes.
+    case $ac_im_incroot in
+	/usr/include) ;;
+	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+    esac
+    case $ac_im_usrlibdir in
+	/usr/lib | /lib) ;;
+	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+    esac
+  fi
+  cd ..
+  rm -fr conftest.dir
+fi
+])# _AC_PATH_X_XMKMF
+
+
+# _AC_PATH_X_DIRECT
+# -----------------
+# Internal subroutine of _AC_PATH_X.
+# Set ac_x_includes and/or ac_x_libraries.
+m4_define([_AC_PATH_X_DIRECT],
+[# Standard set of common directories for X headers.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+ac_x_header_dirs='
+/usr/X11/include
+/usr/X11R6/include
+/usr/X11R5/include
+/usr/X11R4/include
+
+/usr/include/X11
+/usr/include/X11R6
+/usr/include/X11R5
+/usr/include/X11R4
+
+/usr/local/X11/include
+/usr/local/X11R6/include
+/usr/local/X11R5/include
+/usr/local/X11R4/include
+
+/usr/local/include/X11
+/usr/local/include/X11R6
+/usr/local/include/X11R5
+/usr/local/include/X11R4
+
+/usr/X386/include
+/usr/x386/include
+/usr/XFree86/include/X11
+
+/usr/include
+/usr/local/include
+/usr/unsupported/include
+/usr/athena/include
+/usr/local/x11r5/include
+/usr/lpp/Xamples/include
+
+/usr/openwin/include
+/usr/openwin/share/include'
+
+if test "$ac_x_includes" = no; then
+  # Guess where to find include files, by looking for a specified header file.
+  # First, try using that file with no special directory specified.
+  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
+[# We can compile using X headers with no special include directory.
+ac_x_includes=],
+[for ac_dir in $ac_x_header_dirs; do
+  if test -r "$ac_dir/X11/Intrinsic.h"; then
+    ac_x_includes=$ac_dir
+    break
+  fi
+done])
+fi # $ac_x_includes = no
+
+if test "$ac_x_libraries" = no; then
+  # Check for the libraries.
+  # See if we find them without any special options.
+  # Don't add to $LIBS permanently.
+  ac_save_LIBS=$LIBS
+  LIBS="-lXt $LIBS"
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>],
+				  [XtMalloc (0)])],
+		 [LIBS=$ac_save_LIBS
+# We can link X programs with no special library path.
+ac_x_libraries=],
+		 [LIBS=$ac_save_LIBS
+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+do
+  # Don't even attempt the hair of trying to link an X program!
+  for ac_extension in a so sl; do
+    if test -r $ac_dir/libXt.$ac_extension; then
+      ac_x_libraries=$ac_dir
+      break 2
+    fi
+  done
+done])
+fi # $ac_x_libraries = no
+])# _AC_PATH_X_DIRECT
+
+
+# _AC_PATH_X
+# ----------
+# Compute ac_cv_have_x.
+AC_DEFUN([_AC_PATH_X],
+[AC_CACHE_VAL(ac_cv_have_x,
+[# One or both of the vars are not set, and there is no cached value.
+ac_x_includes=no ac_x_libraries=no
+_AC_PATH_X_XMKMF
+_AC_PATH_X_DIRECT
+if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
+  # Didn't find X anywhere.  Cache the known absence of X.
+  ac_cv_have_x="have_x=no"
+else
+  # Record where we found X for the cache.
+  ac_cv_have_x="have_x=yes \
+		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+fi])dnl
+])
+
+
+# AC_PATH_X
+# ---------
+# If we find X, set shell vars x_includes and x_libraries to the
+# paths, otherwise set no_x=yes.
+# Uses ac_ vars as temps to allow command line to override cache and checks.
+# --without-x overrides everything else, but does not touch the cache.
+AN_HEADER([X11/Xlib.h],  [AC_PATH_X])
+AC_DEFUN([AC_PATH_X],
+[dnl Document the X abnormal options inherited from history.
+m4_divert_once([HELP_BEGIN], [
+X features:
+  --x-includes=DIR    X include files are in DIR
+  --x-libraries=DIR   X library files are in DIR])dnl
+
+if test "x$ac_path_x_has_been_run" != xyes; then
+  AC_MSG_CHECKING([for X])
+
+ac_path_x_has_been_run=yes
+AC_ARG_WITH(x, [  --with-x                use the X Window System])
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+  # The user explicitly disabled X.
+  have_x=disabled
+else
+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+    # Both variables are already set.
+    have_x=yes
+  else
+    _AC_PATH_X
+  fi
+  eval "$ac_cv_have_x"
+fi # $with_x != no
+
+if test "$have_x" != yes; then
+  AC_MSG_RESULT([$have_x])
+  no_x=yes
+else
+  # If each of the values was on the command line, it overrides each guess.
+  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+  # Update the cache value to reflect the command line values.
+  ac_cv_have_x="have_x=yes \
+		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+  # It might be that x_includes is empty (headers are found in the
+  # standard search path. Then output the corresponding message
+  ac_out_x_includes=$x_includes
+  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
+  AC_MSG_RESULT([libraries $x_libraries, headers $ac_out_x_includes])
+fi
+
+fi])# AC_PATH_X
+
+
+
+# AC_PATH_XTRA
+# ------------
+# Find additional X libraries, magic flags, etc.
+AC_DEFUN([AC_PATH_XTRA],
+[AC_REQUIRE([AC_PATH_X])dnl
+if test "$no_x" = yes; then
+  # Not all programs may use this symbol, but it does not hurt to define it.
+  AC_DEFINE([X_DISPLAY_MISSING], 1,
+	    [Define to 1 if the X Window System is missing or not being used.])
+  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+else
+  if test -n "$x_includes"; then
+    X_CFLAGS="$X_CFLAGS -I$x_includes"
+  fi
+
+  # It would also be nice to do this for all -L options, not just this one.
+  if test -n "$x_libraries"; then
+    X_LIBS="$X_LIBS -L$x_libraries"
+dnl FIXME: banish uname from this macro!
+    # For Solaris; some versions of Sun CC require a space after -R and
+    # others require no space.  Words are not sufficient . . . .
+    case `(uname -sr) 2>/dev/null` in
+    "SunOS 5"*)
+      AC_MSG_CHECKING([whether -R must be followed by a space])
+      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_nospace=yes, ac_R_nospace=no)
+      if test $ac_R_nospace = yes; then
+	AC_MSG_RESULT([no])
+	X_LIBS="$X_LIBS -R$x_libraries"
+      else
+	LIBS="$ac_xsave_LIBS -R $x_libraries"
+	AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_space=yes, ac_R_space=no)
+	if test $ac_R_space = yes; then
+	  AC_MSG_RESULT([yes])
+	  X_LIBS="$X_LIBS -R $x_libraries"
+	else
+	  AC_MSG_RESULT([neither works])
+	fi
+      fi
+      LIBS=$ac_xsave_LIBS
+    esac
+  fi
+
+  # Check for system-dependent libraries X programs must link with.
+  # Do this before checking for the system-independent R6 libraries
+  # (-lICE), since we may need -lsocket or whatever for X linking.
+
+  if test "$ISC" = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+  else
+    # Martyn Johnson says this is needed for Ultrix, if the X
+    # libraries were built with DECnet support.  And Karl Berry says
+    # the Alpha needs dnet_stub (dnet does not exist).
+    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+    AC_LINK_IFELSE([AC_LANG_CALL([], [XOpenDisplay])],
+		   [],
+    [AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+      AC_CHECK_LIB(dnet_stub, dnet_ntoa,
+	[X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
+    fi])
+    LIBS="$ac_xsave_LIBS"
+
+    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+    # to get the SysV transport functions.
+    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
+    # needs -lnsl.
+    # The nsl library prevents programs from opening the X display
+    # on Irix 5.2, according to T.E. Dickey.
+    # The functions gethostbyname, getservbyname, and inet_addr are
+    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+    AC_CHECK_FUNC(gethostbyname)
+    if test $ac_cv_func_gethostbyname = no; then
+      AC_CHECK_LIB(nsl, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
+      if test $ac_cv_lib_nsl_gethostbyname = no; then
+	AC_CHECK_LIB(bsd, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd")
+      fi
+    fi
+
+    # lieder@skyler.mavd.honeywell.com says without -lsocket,
+    # socket/setsockopt and other routines are undefined under SCO ODT
+    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
+    # on later versions), says Simon Leinen: it contains gethostby*
+    # variants that don't use the name server (or something).  -lsocket
+    # must be given before -lnsl if both are needed.  We assume that
+    # if connect needs -lnsl, so does gethostbyname.
+    AC_CHECK_FUNC(connect)
+    if test $ac_cv_func_connect = no; then
+      AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
+	$X_EXTRA_LIBS)
+    fi
+
+    # Guillermo Gomez says -lposix is necessary on A/UX.
+    AC_CHECK_FUNC(remove)
+    if test $ac_cv_func_remove = no; then
+      AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
+    fi
+
+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+    AC_CHECK_FUNC(shmat)
+    if test $ac_cv_func_shmat = no; then
+      AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")
+    fi
+  fi
+
+  # Check for libraries that X11R6 Xt/Xaw programs need.
+  ac_save_LDFLAGS=$LDFLAGS
+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+  # check for ICE first), but we must link in the order -lSM -lICE or
+  # we get undefined symbols.  So assume we have SM if we have ICE.
+  # These have to be linked with before -lX11, unlike the other
+  # libraries we check for below, so use a different variable.
+  # John Interrante, Karl Berry
+  AC_CHECK_LIB(ICE, IceConnectionNumber,
+    [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], , $X_EXTRA_LIBS)
+  LDFLAGS=$ac_save_LDFLAGS
+
+fi
+AC_SUBST(X_CFLAGS)dnl
+AC_SUBST(X_PRE_LIBS)dnl
+AC_SUBST(X_LIBS)dnl
+AC_SUBST(X_EXTRA_LIBS)dnl
+])# AC_PATH_XTRA

build/bakefiles/files.bkl

@@ -146,6 +146,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/corefoundation/utilsexc_base.cpp
 </set>
 <set var="BASE_COREFOUNDATION_HDR" hints="files">
+    wx/mac/corefoundation/cfdataref.h
+    wx/mac/corefoundation/cfref.h
     wx/mac/corefoundation/cfstring.h
     wx/mac/corefoundation/hid.h
     wx/mac/corefoundation/stdpaths.h
@@ -2073,6 +2075,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- Native color/font dialogs -->
     src/mac/carbon/fontdlgosx.mm
     src/mac/carbon/colordlgosx.mm
+    <!-- cocoa bridge -->
+    src/mac/carbon/utilscocoa.mm
 </if>
 </set>
 
@@ -2432,7 +2436,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/toolbar.mm
     src/cocoa/tooltip.mm
     src/cocoa/toplevel.mm
-    src/cocoa/utils.cpp
+    src/cocoa/utils.mm
     src/cocoa/utilsexc.mm
     src/cocoa/window.mm
     <!-- Generic implementations used by wxCocoa: -->
@@ -2641,6 +2645,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/univ/stdrend.h
     wx/univ/textctrl.h
     wx/univ/theme.h
+    wx/univ/tglbtn.h
     wx/univ/toolbar.h
     wx/univ/toplevel.h
     wx/univ/window.h

build/bakefiles/wxpresets/presets/wx_win32.bkl

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
 <!-- $Id$ -->
 
 <!-- Original source: http://wiki.wxwidgets.org/wiki.pl?Bakefile    -->
@@ -47,6 +47,7 @@ FIXME: this template has (at least) the following bugs:
         <set var="WX_UNICODE">0</set>
         <set var="WX_DEBUG">1</set>
         <set var="WX_SHARED">0</set>
+        <set var="WX_PYTHON">0</set>
     </if>
 
 
@@ -113,6 +114,16 @@ FIXME: this template has (at least) the following bugs:
         </option>
     </if>
 
+    <!-- set this to 1 to use specific settings for wxPython -->
+    <if cond="not isdefined('WX_PYTHON')">
+        <option name="WX_PYTHON" category="path">
+            <values>0,1</values>
+            <default-value>0</default-value>
+            <description>
+                Whether or not we're building against wxPython libraries.
+            </description>
+        </option>
+    </if>
 
     <!--                     HELPER VARIABLES                       -->
     <!--                                                            -->
@@ -129,19 +140,23 @@ FIXME: this template has (at least) the following bugs:
     <!--    The debug define we need with win32 compilers           -->
     <!--    (on Linux, the wx-config program is used).              -->
     <set var="WXDEBUG_DEFINE">
-        <if cond="WX_DEBUG=='1'">__WXDEBUG__</if>
+        <if cond="WX_PYTHON=='1'">__WXDEBUG__</if>
+        <if cond="WX_PYTHON=='0' and WX_DEBUG=='1'">__WXDEBUG__</if>
     </set>
 
     <!--    These are handy ways of dealing with the                -->
     <!--    extensions in the library names of the                  -->
     <!--    wxWindows library.                                      -->
     <set var="WXLIBPOSTFIX">
-        <if cond="WX_DEBUG=='1' and WX_UNICODE=='1'">ud</if>
+        <if cond="WX_PYTHON=='1' and WX_UNICODE=='1'">uh</if>
-        <if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
+        <if cond="WX_PYTHON=='1' and WX_UNICODE=='0'">h</if>
-        <if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
+        <if cond="WX_PYTHON=='0' and WX_DEBUG=='1' and WX_UNICODE=='1'">ud</if>
+        <if cond="WX_PYTHON=='0' and WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
+        <if cond="WX_PYTHON=='0' and WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
     </set>
     <set var="WX3RDPARTYLIBPOSTFIX">
-        <if cond="WX_DEBUG=='1'">d</if>
+        <if cond="WX_PYTHON==0 and WX_DEBUG=='1'">d</if>
+        <if cond="WX_PYTHON==1">h</if>
     </set>
 
     <set var="WXCPU">
@@ -162,10 +177,7 @@ FIXME: this template has (at least) the following bugs:
 
     <!--    All the possible mixes for the wx library names          -->
     <set var="WXLIB_BASE_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)</if>
+        <if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud</if>
 
         <!--
             the trick used to support monolithic builds is here: when the
@@ -173,92 +185,50 @@ FIXME: this template has (at least) the following bugs:
             WX_MONOLITHIC=1, then the base library is translated to the
             monolithic library
         -->
-        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)</if>
+        <if cond="WX_MONOLITHIC=='1'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)</if>
-        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d</if>
-        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u</if>
-        <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud</if>
     </set>
 
     <!--   Libraries whose name is prefixed with 'wxbase'            -->
     <set var="WXLIB_NET_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)_net</if>
+        <if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d_net</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u_net</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud_net</if>
     </set>
     <set var="WXLIB_XML_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)_xml</if>
+        <if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d_xml</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u_xml</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud_xml</if>
     </set>
     <set var="WXLIB_ODBC_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)_odbc</if>
+        <if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_odbc</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d_odbc</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u_odbc</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud_odbc</if>
     </set>
 
     <!--   Libraries whose name is prefixed with 'wx' only          -->
     <set var="WXLIB_CORE_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_core</if>
+        <if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_core</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_core</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_core</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_core</if>
     </set>
     <set var="WXLIB_MEDIA_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_media</if>
+        <if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_media</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_media</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_media</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_media</if>
     </set>
     <set var="WXLIB_XRC_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_xrc</if>
+        <if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_xrc</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_xrc</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_xrc</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_xrc</if>
     </set>
     <set var="WXLIB_HTML_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_html</if>
+        <if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_html</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_html</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_html</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_html</if>
     </set>
     <set var="WXLIB_ADV_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_adv</if>
+        <if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_adv</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_adv</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_adv</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_adv</if>
     </set>
     <set var="WXLIB_QA_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_qa</if>
+        <if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_qa</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_qa</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_qa</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_qa</if>
     </set>
     <set var="WXLIB_DBGRID_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_dbgrid</if>
+        <if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_dbgrid</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_dbgrid</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_dbgrid</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_dbgrid</if>
     </set>
     <set var="WXLIB_GL_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_gl</if>
+        <if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_gl</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_gl</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_gl</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_gl</if>
     </set>
     <set var="WXLIB_AUI_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_aui</if>
+        <if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_aui</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_aui</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_aui</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_aui</if>
     </set>
     <set var="WXLIB_RICHTEXT_NAME">
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)_richtext</if>
+        <if cond="WX_MONOLITHIC=='0'">wx$(WXPORT)$(WX_VERSION)($WXLIBPOSTFIX)_richtext</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)d_richtext</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WXPORT)$(WX_VERSION)u_richtext</if>
-        <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WXPORT)$(WX_VERSION)ud_richtext</if>
     </set>
 
 

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in.
+# From configure.in Id: configure.in 47558 2007-07-19 01:06:01Z VZ .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for wxWidgets 2.8.4.
 #
@@ -966,6 +966,7 @@ Optional Features:
   --enable-compat24       enable wxWidgets 2.4 compatibility
   --disable-compat26      disable wxWidgets 2.6 compatibility
   --disable-rpath         disable use of rpath for uninstalled builds
+  --enable-objc_uniquifying enable Objective-C class name uniquifying
   --enable-intl           use internationalization system
   --enable-config         use wxConfig (and derived) classes
   --enable-protocols      use wxProtocol and derived classes
@@ -1800,7 +1801,7 @@ test -n "$target_alias" &&
 wx_major_version_number=2
 wx_minor_version_number=8
 wx_release_number=4
-wx_subrelease_number=0
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -2627,6 +2628,8 @@ else
     DEFAULT_wxUSE_GTK2=yes
 fi
 
+DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
+
 
 
 
@@ -4618,6 +4621,47 @@ echo "${ECHO_T}no" >&6
 
 
 
+          enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-objc_uniquifying" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-objc_uniquifying... $ECHO_C" >&6
+          no_cache=0
+          # Check whether --enable-objc_uniquifying or --disable-objc_uniquifying was given.
+if test "${enable_objc_uniquifying+set}" = set; then
+  enableval="$enable_objc_uniquifying"
+
+                          if test "$enableval" = yes; then
+                            ac_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes'
+                          else
+                            ac_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no'
+                          fi
+
+else
+
+                          LINE=`grep "wxUSE_OBJC_UNIQUIFYING" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING='$DEFAULT_wxUSE_OBJC_UNIQUIFYING
+
+fi;
+
+          eval "$ac_cv_use_objc_uniquifying"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_objc_uniquifying >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_OBJC_UNIQUIFYING" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+
 
 
           enablestring=
@@ -21270,6 +21314,12 @@ if test "${wx_cv_func_va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
+        ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
         cat >conftest.$ac_ext <<_ACEOF
 
             #include <stdarg.h>
@@ -21296,7 +21346,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21318,6 +21368,12 @@ wx_cv_func_va_copy=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
+        ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 
 
 fi
@@ -36076,7 +36132,7 @@ done
 
 
 
-for ac_func in putenv setenv
+for ac_func in setenv putenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -41937,16 +41993,18 @@ _ACEOF
 
 fi
 
+if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_OBJC_UNIQUIFYING 1
+_ACEOF
+
+fi
 
 
 if test "$wxUSE_DATETIME" = "yes"; then
-
+        echo "$as_me:$LINENO: checking for strptime" >&5
-for ac_func in strptime
+echo $ECHO_N "checking for strptime... $ECHO_C" >&6
-do
+if test "${ac_cv_func_strptime+set}" = set; then
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -41955,12 +42013,12 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+/* Define strptime to an innocuous variant, in case <limits.h> declares strptime.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
+#define strptime innocuous_strptime
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
+    which can conflict with char strptime (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
 
@@ -41970,7 +42028,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 # include <assert.h>
 #endif
 
-#undef $ac_func
+#undef strptime
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -41979,14 +42037,14 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char $ac_func ();
+char strptime ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined (__stub_strptime) || defined (__stub___strptime)
 choke me
 #else
-char (*f) () = $ac_func;
+char (*f) () = strptime;
 #endif
 #ifdef __cplusplus
 }
@@ -41995,7 +42053,7 @@ char (*f) () = $ac_func;
 int
 main ()
 {
-return f != $ac_func;
+return f != strptime;
   ;
   return 0;
 }
@@ -42021,25 +42079,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
+  ac_cv_func_strptime=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+ac_cv_func_strptime=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+echo "${ECHO_T}$ac_cv_func_strptime" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
 
     if test "$ac_cv_func_strptime" = "yes"; then
         echo "$as_me:$LINENO: checking for strptime declaration" >&5
@@ -42121,6 +42172,67 @@ echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6
 #define HAVE_STRPTIME_DECL 1
 _ACEOF
 
+    else
+        wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);"
+    fi
+    if test "$ac_cv_func_strptime" = "yes"; then
+                                        echo "$as_me:$LINENO: checking whether strptime() fails on invalid strings" >&5
+echo $ECHO_N "checking whether strptime() fails on invalid strings... $ECHO_C" >&6
+if test "${wx_cv_func_strptime_ok+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+                  wx_cv_func_strptime_ok=no
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+
+                    #include <stdlib.h>
+                    #include <time.h>
+                    #include "confdefs.h"
+
+                    $wx_strptime_decl
+
+                    int main()
+                    {
+                        struct tm t;
+                        return !!strptime("", "%x", &t);
+                    }
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  wx_cv_func_strptime_ok=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+wx_cv_func_strptime_ok=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+fi
+echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5
+echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6
+
+        if test "$wx_cv_func_strptime_ok" = "yes"; then
+            cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRPTIME 1
+_ACEOF
+
+        fi
     fi
 
             echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
@@ -44705,13 +44817,8 @@ if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
 #define wxUSE_SYSTEM_OPTIONS 1
 _ACEOF
 
-    if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
-        "$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
-    fi
 fi
 
-
 if test "$wxUSE_VALIDATORS" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_VALIDATORS 1
@@ -45283,14 +45390,12 @@ fi
 
 if test "$wxUSE_MAC" = 1 ; then
     if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
-        if test "$USE_DARWIN" = 1; then
+        if test "$USE_DARWIN" != 1; then
-            LDFLAGS="$LDFLAGS -framework QuickTime"
-        else
             LDFLAGS="$LDFLAGS -lQuickTimeLib"
         fi
     fi
     if test "$USE_DARWIN" = 1; then
-        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System"
+        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System -framework QuickTime"
     else
         LDFLAGS="$LDFLAGS -lCarbonLib"
     fi
@@ -45313,7 +45418,7 @@ if test "$wxUSE_GUI" = "yes"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
                      dynamic erase event exec font image minimal mobile \
                      mobile/wxedit mobile/styles propsize render \
-                     rotate shaped vscroll widgets"
+                     rotate shaped taskbar vscroll widgets"
 
     if test "$wxUSE_MONOLITHIC" != "yes"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"

configure.in

@@ -35,7 +35,7 @@ dnl wx_release_number += 1
 wx_major_version_number=2
 wx_minor_version_number=8
 wx_release_number=4
-wx_subrelease_number=0
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -820,6 +820,9 @@ else
   DEFAULT_wxUSE_GTK2=yes
 fi
 
+dnl Always default to no. Only special cases require this.
+DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
+
 
 dnl WX_ARG_WITH should be used to select whether an external package will be
 dnl used or not, to configure compile-time features of this package itself,
@@ -942,6 +945,7 @@ WX_ARG_ENABLE(compat26,      [  --disable-compat26      disable wxWidgets 2.6 co
 
 WX_ARG_ENABLE(rpath,         [  --disable-rpath         disable use of rpath for uninstalled builds], wxUSE_RPATH)
 
+WX_ARG_ENABLE(objc_uniquifying,[  --enable-objc_uniquifying enable Objective-C class name uniquifying], wxUSE_OBJC_UNIQUIFYING)
 
 dnl ---------------------------------------------------------------------------
 dnl (small) optional non GUI classes
@@ -1837,7 +1841,7 @@ AC_CHECK_HEADERS(stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h,,, [AC_
 
 dnl maybe wchar_t is in wcstr.h if we don't have wchar.h?
 if test "$ac_cv_header_wchar_h" != "yes"; then
-    AC_CHECK_HEADER(wcstr.h,,, [AC_INCLUDES_DEFAULT()])
+    AC_CHECK_HEADERS(wcstr.h,,, [AC_INCLUDES_DEFAULT()])
 fi
 
 case "${host}" in
@@ -1855,7 +1859,7 @@ esac
 
 dnl POSIX needs this for select(), but old systems don't have it
 if test "$USE_UNIX" = 1 ; then
-    AC_CHECK_HEADER([sys/select.h],,, [AC_INCLUDES_DEFAULT()])
+    AC_CHECK_HEADERS([sys/select.h],,, [AC_INCLUDES_DEFAULT()])
 fi
 
 dnl ---------------------------------------------------------------------------
@@ -1922,6 +1926,7 @@ dnl checks needed to define wxVaCopy
 AC_CACHE_CHECK([for va_copy],
     wx_cv_func_va_copy,
     [
+        AC_LANG_PUSH(C++)
         AC_LINK_IFELSE([
             #include <stdarg.h>
             void foo(char *f, ...)
@@ -1940,6 +1945,7 @@ AC_CACHE_CHECK([for va_copy],
             wx_cv_func_va_copy=yes,
             wx_cv_func_va_copy=no
         )
+        AC_LANG_POP()
     ]
 )
 
@@ -3009,7 +3015,7 @@ WIDGET_SET=
 dnl are we building for a win32 target environment?
 dnl If so, setup common stuff needed for both GUI and Base libs.
 if test "$USE_WIN32" = 1 ; then
-    AC_CHECK_HEADER(w32api.h,,, [ ])
+    AC_CHECK_HEADERS(w32api.h,,, [ ])
     AC_CHECK_HEADER(windows.h,,
     [
         AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
@@ -3846,8 +3852,8 @@ dnl do this after test for X11 above so that we have a chance of finding Xlib.h
 if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
         dnl defines HAVE_X11_XKBLIB_H
-        AC_CHECK_HEADER(X11/Xlib.h,,, [ ])
+        AC_CHECK_HEADERS(X11/Xlib.h,,, [ ])
-        AC_CHECK_HEADER([X11/XKBlib.h],,,
+        AC_CHECK_HEADERS([X11/XKBlib.h],,,
                          [
                           #if HAVE_X11_XLIB_H
                             #include <X11/Xlib.h>
@@ -3930,7 +3936,7 @@ dnl ---------------------------------------------------------------------------
             WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm)
             if test "$ac_find_libraries" != "" ; then
                 AC_MSG_RESULT([yes])
-                AC_CHECK_HEADER([X11/extensions/xf86vmode.h],
+                AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
                                  [
                                   GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
                                  ],
@@ -4674,7 +4680,7 @@ if test "$wxUSE_UNICODE" = yes; then
 #include <wchar.h>"
     case "${host}" in
         *-*-solaris2* )
-            AC_CHECK_HEADER(widec.h,,, [AC_INCLUDES_DEFAULT()])
+            AC_CHECK_HEADERS(widec.h,,, [AC_INCLUDES_DEFAULT()])
             if test "$ac_cv_header_widec_h" = "yes"; then
                 wchar_headers="$wchar_headers
 #include <widec.h>"
@@ -4947,7 +4953,7 @@ dnl check for timegm() used by datetime.cpp
 AC_CHECK_FUNCS(timegm)
 
 dnl look for a function to modify the environment
-AC_CHECK_FUNCS(putenv setenv, break)
+AC_CHECK_FUNCS(setenv putenv, break)
 
 HAVE_SOME_SLEEP_FUNC=0
 if test "$USE_BEOS" = 1; then
@@ -5041,7 +5047,7 @@ dnl ------------------------------------------
 dnl Check for ESD:
 EXTRALIBS_ESD=
 AC_CHECK_LIB(esd, esd_close, [
-    AC_CHECK_HEADER([esd.h], [
+    AC_CHECK_HEADERS([esd.h], [
     EXTRALIBS_ESD="-lesd"
   ],
   [],
@@ -5280,7 +5286,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
         AC_DEFINE(wxHAVE_PTHREAD_CLEANUP)
       fi
 
-      AC_CHECK_HEADER(sched.h,,, [AC_INCLUDES_DEFAULT()])
+      AC_CHECK_HEADERS(sched.h,,, [AC_INCLUDES_DEFAULT()])
       if test "$ac_cv_header_sched_h" = "yes"; then
           AC_CHECK_FUNC(sched_yield,
             AC_DEFINE(HAVE_SCHED_YIELD),
@@ -6076,6 +6082,9 @@ if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
   AC_DEFINE(wxUSE_PRINTF_POS_PARAMS)
 fi
 
+if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then
+  AC_DEFINE(wxUSE_OBJC_UNIQUIFYING)
+fi
 
 dnl ---------------------------------------------------------------------------
 dnl time/date functions
@@ -6083,8 +6092,7 @@ dnl ---------------------------------------------------------------------------
 
 if test "$wxUSE_DATETIME" = "yes"; then
     dnl check for strptime and for its declaration as some systems lack it
-    dnl FIXME: use WX_CHECK_FUNCS instead
+    AC_CHECK_FUNC(strptime)
-    AC_CHECK_FUNCS(strptime)
     if test "$ac_cv_func_strptime" = "yes"; then
         AC_CACHE_CHECK([for strptime declaration], wx_cv_func_strptime_decl,
             [
@@ -6106,6 +6114,40 @@ if test "$wxUSE_DATETIME" = "yes"; then
     fi
     if test "$wx_cv_func_strptime_decl" = "yes"; then
         AC_DEFINE(HAVE_STRPTIME_DECL)
+    else
+        wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);"
+    fi
+    if test "$ac_cv_func_strptime" = "yes"; then
+        dnl strptime() behaviour doesn't conform to POSIX under Mac OS X <
+        dnl 10.5 and possibly other BSD variants, check that strptime() we
+        dnl have fails to parse format when the string doesn't match it instea
+        dnl of just stopping immediately and returning non-NULL
+        AC_CACHE_CHECK([whether strptime() fails on invalid strings],
+            wx_cv_func_strptime_ok,
+            [AC_RUN_IFELSE(
+                [
+                    #include <stdlib.h>
+                    #include <time.h>
+                    #include "confdefs.h"
+
+                    $wx_strptime_decl
+
+                    int main()
+                    {
+                        struct tm t;
+                        return !!strptime("", "%x", &t);
+                    }
+                ],
+                wx_cv_func_strptime_ok=yes,
+                wx_cv_func_strptime_ok=no,
+                dnl be pessimistic when cross-compiling
+                wx_cv_func_strptime_ok=no
+            )]
+        )
+
+        if test "$wx_cv_func_strptime_ok" = "yes"; then
+            AC_DEFINE(HAVE_STRPTIME)
+        fi
     fi
 
     dnl check for timezone variable
@@ -6487,7 +6529,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
             dnl can't be compiled because of an error and with the default
             dnl AC_CHECK_HEADER semantics we'd still detect it in this case and
             dnl build would fail later
-            AC_CHECK_HEADER(linux/joystick.h, [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()])
+            AC_CHECK_HEADERS(linux/joystick.h, [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()])
         fi
     fi
 
@@ -6624,7 +6666,7 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
                           -o "$wxUSE_CLIPBOARD"     = "yes" \
                           -o "$wxUSE_OLE"     = "yes" \
                           -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
-    AC_CHECK_HEADER(ole2.h,,, [ ])
+    AC_CHECK_HEADERS(ole2.h,,, [ ])
 
     if test "$ac_cv_header_ole2_h" = "yes" ; then
         if test "$GCC" = yes ; then
@@ -7198,13 +7240,8 @@ fi
 
 if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
     AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
-    if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
-        "$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
-    fi
 fi
 
-
 if test "$wxUSE_VALIDATORS" = "yes"; then
     AC_DEFINE(wxUSE_VALIDATORS)
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
@@ -7510,14 +7547,12 @@ dnl all additional libraries (except wxWidgets itself) we link with
 
 if test "$wxUSE_MAC" = 1 ; then
     if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
-        if test "$USE_DARWIN" = 1; then
+        if test "$USE_DARWIN" != 1; then
-            LDFLAGS="$LDFLAGS -framework QuickTime"
-        else
             LDFLAGS="$LDFLAGS -lQuickTimeLib"
         fi
     fi
     if test "$USE_DARWIN" = 1; then
-        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System"
+        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System -framework QuickTime"
     else
         LDFLAGS="$LDFLAGS -lCarbonLib"
     fi
@@ -7543,7 +7578,7 @@ if test "$wxUSE_GUI" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
                      dynamic erase event exec font image minimal mobile \
                      mobile/wxedit mobile/styles propsize render \
-                     rotate shaped vscroll widgets"
+                     rotate shaped taskbar vscroll widgets"
 
     if test "$wxUSE_MONOLITHIC" != "yes"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"

debian/changelog

@@ -1,3 +1,41 @@
+wxwidgets2.8 (2.8.4.2-0) unstable; urgency=low
+
+  * Pacakges now support all Python versions in `pyversions -r`
+  * If the system Python supports it a debug wxPython package is built that
+    can be installed side-by-side with the non-debug package 	
+  * Added colour normalization to PNM image handler (Ray Johnston).
+  * Fixed selecting part of word from right to left in wxHTML (Michael Hieke).
+  * Selecting text in wxHTML with character precision was made easier, it's
+    enough to select half of a character (Michael Hieke).
+  * Significantly improved startup times of XRC-based applications using
+    embedded resources on Unix (requires resources recompilation).
+  * Fixed freeing of "static" alpha data in wxImage (Axel Gembe).
+  * Added tab mouse click events to wxAuiNotebook (Ben Williams).
+  * Option for middle-click tab close in wxAuiNotebook (Ben Williams).
+  * Added wxAuiNotebook::SetFont, GetTabCtrlHeight, GetHeightForPageHeight.
+  * Added SetBitmap/GetBitmap to wxWizard, to allow e.g. on-the-fly creation
+    of bitmap to fit page height.
+  * Fixed wxXPMHandler::SaveFile for images with more than 92 colors.
+  * Fixed a crash in wxGrid on creation due to OnSize being called too soon.
+  * Fixed missing key events in wxGTK1 build.
+  * Setting foreground colour of single line wxTextCtrl now works.
+  * More work on setting defaults in GNOME print dialogs.
+  * Also made landscape printing work as per wxMSW.
+  * Add support for (rectangular) clipping in GNOME print backend.
+  * Speed up wxBitmap::Rescale().
+  * Add right button event for wxToolbar's tools (Tim Kosse).
+  * Made wxWindow::SetScrollPos and wxScrollbar::SetThumbPos
+    not emit any event.
+  * Correct hyperactive mouse wheel support.
+  * Correct grid line mode in wxListCtrl.
+  * Don't unconditionally add wxCAPTION style to wxMiniFrame.
+  * Fixed crash in file and dir pickers for GTK+ < 2.6 if compiled
+    with GTK+ >= 2.6.
+  * Generate wxEVT_COMMAND_LIST_END_LABEL_EDIT event even if label didn't change
+
+
+ -- Robin Dunn <robin@alldunn.com>  Thu, 19 Jul 2007 15:42:23 -0700
+
 wxwidgets2.8 (2.8.4.0-0) unstable; urgency=low
 
   * Fix bug in wxFileConfig when recreating a group (Steven Van Ingelgem)

debian/control.in

@@ -1,9 +1,10 @@
 Source: wxwidgets=V
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libsm-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev, libgconf2-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
+Build-Depends: debhelper (>=4.0), flex, bison, gettext, bc, libgtk2.0-dev, =PY_BUILD_DEPS, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libsm-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev, libgconf2-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
 Maintainer: wxWidgets dev-team <wx-dev@lists.wxwidgets.org>
-Standards-Version: 3.6.2.1
+XS-Python-Version: all
+Standards-Version: 3.7.2.1
 
 Package: libwxbase=SOV=U
 Architecture: any
@@ -25,7 +26,7 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWidgets too
 Package: libwxbase=V=U-dev
 Architecture: any
 Section: libdevel
-Depends: wx=V-headers (= ${Source-Version}), libwxbase=SOV=U (= ${Source-Version}), libc6-dev
+Depends: wx=V-headers (= ${Source-Version}), libwxbase=SOV=U (= ${Source-Version}), libc6-dev | libc-dev
 Suggests: wx=V-doc, gettext
 Description: wxBase library (development) - non-GUI support classes of wxWidgets toolkit
  wxBase is a collection of C++ classes providing basic data structures
@@ -75,7 +76,7 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime)
 Package: libwxgtk=V=U-dev
 Architecture: any
 Section: libdevel
-Depends: wx=V-headers (= ${Source-Version}), libwxgtk=SOV=U (= ${Source-Version}), libwxbase=V=U-dev (= ${Source-Version}), libc6-dev
+Depends: wx=V-headers (= ${Source-Version}), libwxgtk=SOV=U (= ${Source-Version}), libwxbase=V=U-dev (= ${Source-Version})
 Suggests: wx-common, wx=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
 Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
@@ -90,7 +91,7 @@ Package: libwxgtk=V=U-dbg
 Architecture: any
 Section: libdevel
 Priority: extra
-Depends: wx=V-headers (= ${Source-Version}), libwxbase=V=U-dbg (= ${Source-Version}), libc6-dev
+Depends: wx=V-headers (= ${Source-Version}), libwxbase=V=U-dbg (= ${Source-Version})
 Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
  GUI components and other facilities on several popular platforms (and some
@@ -101,79 +102,6 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
  provides many internal checks by wxWidgets itself that are not performed on
  apps compiled with the 'release version' libs in the -dev package.
 
-Package: python-wxgtk=V=U
-Architecture: any
-Section: python
-Depends: python-wxversion, =PY, ${shlibs:Depends}
-Suggests: wx=V-doc, wx=V-examples, =PY-xml
-Conflicts: libwxgtk2.6-0-python, wxpython2.6-0
-Replaces: libwxgtk2.6-0-python, wxpython2.6-0
-Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
- .
- This package provides a Python binding to the wxGTK library and the
- wxPython runtime support libraries.  If you wish to use xrc you'll also
- need the =PY-xml package installed.
-
-Package: python-wxgtk=V=U-dbg
-Architecture: any
-Section: python
-Depends: python-wxversion, =PY, ${shlibs:Depends}
-Conflicts: python-wxgtk=V=U
-Replaces: python-wxgtk=V=U
-Provides: python-wxgtk=V=U
-Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
- wxWidgets is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
- .
- This package provides a Python binding to the wxGTK debug library.
- It is useful for developers as many common errors may be caught, but
- you should _never_ upload packages to Debian that depend upon this
- package explicitly, use the python-wxgtk=V=U package instead.
- .
- If you wish to use xrc you'll also need the =PY-xml package installed.
-
-Package: python-wxversion
-Architecture: all
-Section: python
-Conflicts: wxpython2.6-0
-Replaces: wxpython2.6-0
-Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
- .
- This package provides the wxPython version selector.
-
-Package: python-wxaddons
-Architecture: all
-Section: python
-Conflicts: python-wxgtk2.6
-Replaces:
-Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython add-on packages base)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
- .
- This package provides a base Python package for 3rd party add-ons.
-
-Package: python-wxtools
-Architecture: all
-Section: python
-Depends: python-wxgtk=V=U
-Conflicts: wxpython2.6-0
-Replaces: wxpython2.6-0, libwxgtk2.4-python, wxpython2.4-1
-Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files)
- wxWidgets (formerly known as wxWindows) is a class library for C++ providing
- GUI components and other facilities on several popular platforms (and some
- unpopular ones as well).  For more information see http://wxwidgets.org
- .
- This package provides support utilities and common files for wxPython=V=U.
- If you wish to use xrced you'll also need the =PY-xml package installed.
-
 Package: wx-common
 Architecture: any
 Section: devel
@@ -259,3 +187,81 @@ Depends: wx=V-headers (= ${Source-Version})
 Description: Extra wxWidgets headers for mingw32msvc-cross
  Headers required by the wxWidgets mingw32msvc-cross libraries.
 
+
+
+
+Package: python-wxgtk=V=U
+Architecture: any
+Section: python
+Depends: python-wxversion,  ${python:Depends}, ${shlibs:Depends}
+Suggests: wx=V-doc, wx=V-examples, python-xml
+Conflicts: libwxgtk2.6-0-python, wxpython2.6-0
+Replaces: libwxgtk2.6-0-python, wxpython2.6-0
+XB-Python-Version: ${python:Versions}
+Provides: ${python:Provides}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well).  For more information see http://wxwidgets.org
+ .
+ This package provides a Python binding to the wxGTK library and the
+ wxPython runtime support libraries.  If you wish to use xrc you'll also
+ need the python-xml package installed.
+
+Package: python-wxgtk=V=U-dbg
+Priority: extra
+Architecture: any
+Section: python
+Depends: python-wxgtk=V=U (= ${Source-Version}), python-dbg, ${shlibs:Depends}
+Suggests: python-xml-dbg
+XB-Python-Version: ${python:Versions}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding, debug version)
+ wxWidgets is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package provides a Python binding to the wxGTK debug library.
+ This package contains the extensions built for the python debug interpreter.
+
+Package: python-wxversion
+Architecture: all
+Section: python
+Depends: ${python:Depends}
+Conflicts: wxpython2.6-0
+Replaces: wxpython2.6-0
+XB-Python-Version: ${python:Versions}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well).  For more information see http://wxwidgets.org
+ .
+ This package provides the wxPython version selector.
+
+Package: python-wxaddons
+Architecture: all
+Section: python
+Conflicts: python-wxgtk2.6 (<< 2.6.4.0)
+Depends: ${python:Depends}, python-wxgtk=V=U
+XB-Python-Version: ${python:Versions}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython add-on packages base)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well).  For more information see http://wxwidgets.org
+ .
+ This package provides a base Python package for 3rd party add-ons.
+
+Package: python-wxtools
+Architecture: all
+Section: python
+Depends: python-wxgtk=V=U, ${python:Depends}
+Conflicts: wxpython2.6-0
+Replaces: wxpython2.6-0, libwxgtk2.4-python, wxpython2.4-1
+XB-Python-Version: ${python:Versions}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well).  For more information see http://wxwidgets.org
+ .
+ This package provides support utilities and common files for wxPython=V=U.
+ If you wish to use xrced you'll also need the python-xml package installed.
+

debian/copyright

@@ -1,13 +1,13 @@
 This package was debianized by Ron Lee <ron@debian.org> on
 Sun, 13 Feb 2000 18:40:00 +1030.
 
-more information about wxWindows, as well as the source these debs
+More information about wxWidgets, as well as the source these debs
-are produced from can be found at www.wxwindows.org
+are produced from can be found at www.wxwidgets.org
 
 Note for Debian users:
 ======================
 
-Most of the core wxWindows library is licenced under the wxWindows Library
+Most of the core wxWidgets library is licenced under the wxWindows Library
 Licence (included below), however some additional features of the library
 may include source licenced under terms which do not include the exception
 permitting you to licence binary object code versions of works based on the
@@ -20,7 +20,7 @@ you wish to release your code under a licence which does not grant all of
 the same rights as the LGPL would assert but would be permitted under the
 terms of the exception, then you are strongly advised to either check the
 licencing terms of all components that these debs (and all future versions
-that you use) are built with, or build your own binaries of wxWindows which
+that you use) are built with, or build your own binaries of wxWidgets which
 include only such code as is definitely covered by the exception.
 
 You should presume that these debs will fall under the provisions of the

debian/python-wxaddons.postinst

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+

debian/python-wxaddons.prerm

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+

debian/python-wxgtk-dbg.postinst

@@ -2,15 +2,20 @@
 
 set -e
 
-WXPYTHONDIR="/=WXPYDIR"
+WXPYTHONDIR="=WXPYDIR"
+PYVERS="=PYVERS"
 
 if [ "$1" = "configure" ]; then
-	=PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
+    for PY in $PYVERS; do
-	=PY -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
+	$PY    /usr/lib/$PY/compileall.py -q /usr/lib/$PY/site-pacakges/${WXPYTHONDIR}
+	$PY -O /usr/lib/$PY/compileall.py -q /usr/lib/$PY/site-pacakges/${WXPYTHONDIR}
+    done
 fi
 
-update-alternatives --install /usr/lib/=PY/site-packages/wx.pth  wx.pth	\
+for PY in $PYVERS; do
-			      /usr/lib/wx/python/wx=V-dbg.pth    $(( =PRIO - 10 ))
+    update-alternatives --install /usr/lib/$PY/site-packages/wx.pth  wx.pth	\
+	  		          /usr/lib/wx/$PY/wx=V-dbg.pth    $(( =PRIO - 10 ))
+done
 
 #DEBHELPER#
 

debian/python-wxgtk-dbg.prerm

@@ -5,7 +5,9 @@ set -e
 PACKAGE="python-wxgtk=V-dbg"
 dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
 
-update-alternatives --remove wx.pth /usr/lib/wx/python/wx=V-dbg.pth
+for PY in =PYVERS; do
+    update-alternatives --remove wx.pth /usr/lib/wx/$PY/wx=V-dbg.pth
+done
 
 #DEBHELPER#
 

debian/python-wxgtk.postinst

@@ -2,15 +2,14 @@
 
 set -e
 
-WXPYTHONDIR="/=WXPYDIR"
+WXPYTHONDIR="=WXPYDIR"
+PYVERS="=PYVERS"
 
-if [ "$1" = "configure" ]; then
+for PY in $PYVERS; do
-	=PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
+    update-alternatives --install /usr/lib/python$PY/site-packages/wx.pth  \
-	=PY -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
+	wx-python$PY.pth	                                           \
-fi
+	/usr/lib/wx/python$PY/wx=V.pth       =PRIO
-
+done
-update-alternatives --install /usr/lib/=PY/site-packages/wx.pth  wx.pth	\
-			      /usr/lib/wx/python/wx=V.pth        =PRIO
 
 #DEBHELPER#
 

debian/python-wxgtk.prerm

@@ -2,10 +2,9 @@
 
 set -e
 
-PACKAGE="python-wxgtk=V"
+for PY in =PYVERS; do
-dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
+    update-alternatives --remove wx-python$PY.pth /usr/lib/wx/python$PY/wx=V.pth
-
+done
-update-alternatives --remove wx.pth /usr/lib/wx/python/wx=V.pth
 
 #DEBHELPER#
 

debian/python-wxversion.postinst

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+

debian/python-wxversion.prerm

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+

debian/rules

@@ -5,24 +5,20 @@
 # variously stolen code :-)
 # It makes copious use of the debhelper utilities written by
 # Joey Hess and others.
+#
+# Significantly hacked up in July 2007 by Robin Dunn
+#
 
 #export DH_VERBOSE=1
 export DH_OPTIONS
 
 ifdef CONCURRENCY_LEVEL
-
   # A user who knows what they want, that's like gold...
   # respect their precious opinion of how much blue smoke to use.
   JOB_COUNT := $(CONCURRENCY_LEVEL)
-
 else ifdef DISTCC_HOSTS
-
  # Otherwise, if they have a cluster, try to put it to good use.
   JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$\#)
-
- # Not much faster, but it might keep you warm in winter...
- #JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# + $$\#)))
-
 endif
 
 ifdef JOB_COUNT
@@ -31,7 +27,37 @@ else
   FAST_MAKE = $(MAKE)
 endif
 
--include debian/python-version
+
+# Find the python version(s) to build for
+PYVERS := $(shell pyversions -vr 2> /dev/null || pyversions -vs 2> /dev/null)
+ifeq ($(strip $(PYVERS)),)
+    PYVERS := $(shell python -c 'import sys; print sys.version[:3]')
+    NO_PYCENTRAL = 1
+    PY_BUILD_DEPS = python$(PYVERS), python$(PYVERS)-dbg, python$(PYVERS)-dev
+else
+    DEB_PYTHON_SYSTEM=pycentral
+    PY_BUILD_DEPS = python-all, python-all-dev, python-dbg, python-central
+endif
+
+
+# The python-dbg on Dapper had a configuration bug that makes trying
+# to use distutils with it error out.  The problem seems to be that
+# the exec_prefix was set wrong.  Try to detect that so we can skip
+# building the py -dbg pacakge there.
+ifeq (/usr, $(shell python-dbg -c "import sys;print sys.exec_prefix" 2> /dev/null))
+
+    # Also check if this python will put the _d on the end of the 
+    # extension modules as this is needed to allow them to be installed 
+    # side-by-side with the non-debug package.  Ubuntu appears to be 
+    # handling this by adding a sys.pydebug attribute that is checked for
+    # in distutils to know which config dir to use.  We can use the same 
+    # thing here, but there should probably be a safer way to do it.
+    ifeq (True, $(shell python-dbg -c "import sys; print hasattr(sys,'pydebug') and sys.pydebug" 2> /dev/null))
+
+        # This means it is ok to try and build the dbg wxPython package
+        PY_DBG_OK = 1
+    endif
+endif
 
 
 # If another source package is to supply the common binary packages
@@ -40,8 +66,7 @@ endif
 # all if this is to be the default (or only) wx source package for the
 # target release.
 #
-# for etch:
+#DEBIAN_WX_DEFAULT_VERSION = 2.8
-#DEBIAN_WX_DEFAULT_VERSION = 2.6
 
 
 # This will extract a flavour out of the name of the source directory
@@ -61,6 +86,7 @@ wx_major_version_number := $(shell sed -n 's/^wx_major_version_number=//p' confi
 wx_minor_version_number := $(shell sed -n 's/^wx_minor_version_number=//p' configure.in)
 wx_release_number       := $(shell sed -n 's/^wx_release_number=//p' configure.in)
 wx_subrelease_number    := $(shell sed -n 's/^wx_subrelease_number=//p' configure.in)
+full_version := $(wx_major_version_number).$(wx_minor_version_number).$(wx_release_number).$(wx_subrelease_number)
 
 ##release   := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p' | sed 's/-ansi//')
 release  := $(wx_major_version_number).$(wx_minor_version_number)
@@ -88,10 +114,6 @@ endif
 # Base value for alternative priorities.
 alt_prio  := $(subst .,,$(release))
 
-pytoolkit := gtk2
-pydir     := usr/lib/$(python_ver)/site-packages
-wxpydir   := $(pydir)/wx-$(compatible_release)-$(pytoolkit)
-
 cross_host  := i586-mingw32msvc
 cross_build := $(shell ./config.guess)
 
@@ -123,6 +145,7 @@ GTK_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \
     --with-libtiff=sys \
 
 
+pytoolkit := gtk2
 PY_WX_CONFIG_OPTIONS = --version=$(release) --toolkit=$(pytoolkit) --static=no
 
 WX_UNICODE := 1
@@ -131,8 +154,8 @@ WX_OPENGL := 1
 ifeq ($(WX_UNICODE),1)
     COMMON_CONFIGURE_OPTIONS += --enable-unicode
     PY_WX_CONFIG_OPTIONS += --unicode
-    PY_UNICODE="UNICODE=1"
+    PY_UNICODE = UNICODE=1
-    wxpydir := $(pydir)/wx-$(compatible_release)-$(pytoolkit)-unicode
+    wxpydir := wx-$(compatible_release)-$(pytoolkit)-unicode
 
     # for compatibility with the existing 2.6 packages, we don't use "u" in
     # the Unicode (default) package names
@@ -141,15 +164,21 @@ else
     # but we do need to use something for non-Unicode packages to distinguish
     # them
     unicode_suffix := -ansi
+    PY_UNICODE = UNICODE=0
+    wxpydir   := wx-$(compatible_release)-$(pytoolkit)
 endif
 
 ifeq ($(WX_OPENGL),1)
     GTK_CONFIGURE_OPTIONS += --with-opengl
+    PY_OPENGL = BUILD_GLCANVAS=1
 else
     GTK_CONFIGURE_OPTIONS += --without-opengl
+    PY_OPENGL = BUILD_GLCANVAS=0
 endif
 
-# Packages to build:
+#---------------------------------------------------------------------------
+# Packages to build
+
 package_wxbase_lib      := libwxbase$(sorelease)$(unicode_suffix)
 package_wxbase_dev      := libwxbase$(release)$(unicode_suffix)-dev
 package_wxbase_dbg      := libwxbase$(release)$(unicode_suffix)-dbg
@@ -158,45 +187,44 @@ package_gtk_lib         := libwxgtk$(sorelease)$(unicode_suffix)
 package_gtk_dev         := libwxgtk$(release)$(unicode_suffix)-dev
 package_gtk_dbg         := libwxgtk$(release)$(unicode_suffix)-dbg
 
-
-
-
-package_gtk_py_lib      := python-wxgtk$(release)$(unicode_suffix)
-package_gtk_py_ver       = python-wxversion
-package_gtk_py_tools     = python-wxtools
-package_gtk_py_addons    = python-wxaddons
-
 package_headers         := wx$(release)-headers
 package_i18n            := wx$(release)-i18n
 package_doc             := wx$(release)-doc
 package_examples        := wx$(release)-examples
 package_common           = wx-common
 
+package_gtk_py_lib      := python-wxgtk$(release)$(unicode_suffix)
+package_gtk_py_ver       = python-wxversion
+package_gtk_py_tools     = python-wxtools
+package_gtk_py_addons    = python-wxaddons
+package_gtk_dbg_py      := python-wxgtk$(release)$(unicode_suffix)-dbg
+
+
 # The packages listed here are common to all wx versions, and may be provided
 # by another source package if more than one is in the release simultaneously.
 common_packages	:= $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools) $(package_gtk_py_addons)
 
 
-package_gtk_dbg_py      := python-wxgtk$(release)$(unicode_suffix)-dbg
-
-
-
 package_msw_dev         := libwxmsw$(release)$(unicode_suffix)-dev
 package_msw_dbg         := libwxmsw$(release)$(unicode_suffix)-dbg
 package_headers_msw     := wx$(release)-headers-msw
 
 # The packages listed here will not be built by default.
-extra_packages := $(package_gtk_dbg_py)                                      \
+extra_packages := $(package_msw_dev) $(package_msw_dbg) $(package_headers_msw)
-		  $(package_msw_dev) $(package_msw_dbg) $(package_headers_msw)
 
 ifdef DEBIAN_WX_DEFAULT_VERSION
+    extra_packages += $(common_packages)
+endif
 
-  extra_packages += $(common_packages)
+ifndef PY_DBG_OK
-
+    extra_packages += $(package_gtk_dbg_py)
 endif
 
 
-# Build directories:
+
+#---------------------------------------------------------------------------
+# Build directories
+
 objdir_wxbase_shared       = objs_wxbase_sh
 objdir_wxbase_debug        = objs_wxbase_d
 objdir_gtk_shared          = objs_gtk_sh
@@ -218,6 +246,9 @@ objdirs := $(objdir_wxbase_shared) $(objdir_wxbase_debug)                  \
 	   $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)     \
 	   $(objdir_msw_install)
 
+#---------------------------------------------------------------------------
+# Build stamps:
+
 #	note that the i18n package is actually arch indep (once built)
 #	but must be built (and installed) during the arch any phase as
 #	it's pulled out of the wxGTK shared lib package.
@@ -226,11 +257,14 @@ objdirs := $(objdir_wxbase_shared) $(objdir_wxbase_debug)                  \
 #       all files for it are installed during the arch any phase.
 
 
-# Build stamps:
 build_arch_stamps = build-wxbase-shared-stamp build-wxbase-debug-stamp    \
                     build-gtk-shared-stamp build-gtk-shared-contrib-stamp \
                     build-gtk-debug-stamp build-gtk-debug-contrib-stamp   \
-                    build-i18n-stamp build-gtk-py-stamp
+                    build-i18n-stamp build-gtk-py-stamp 
+
+ifdef PY_DBG_OK
+    build_arch_stamps += build-gtk-dbg-py-stamp
+endif
 
 build_indep_stamps = build-examples-stamp build-doc-stamp
 
@@ -241,16 +275,19 @@ build_stamps_native := $(build_arch_stamps) $(build_indep_stamps)
 build_stamps := $(build_stamps_native) $(build_cross_stamps)
 
 
+#---------------------------------------------------------------------------
 # Install targets:
-install_all_arch = install-wxbase-lib install-wxbase-dev install-wxbase-dbg  \
+
-                   install-gtk-lib install-gtk-dev install-gtk-dbg        \
+install_all_arch = install-wxbase-lib install-wxbase-dev install-wxbase-dbg	\
-                   install-headers install-i18n            \
+                   install-gtk-lib install-gtk-dev install-gtk-dbg        	\
-                   install-gtk-py
+                   install-headers install-i18n install-gtk-py 
 
 ifndef DEBIAN_WX_DEFAULT_VERSION
+    install_all_arch += install-common
+endif
 
-  install_all_arch += install-common
+ifdef PY_DBG_OK
-
+    install_all_arch += install-gtk-dbg-py
 endif
 
 install_all_indep = install-examples install-doc
@@ -262,25 +299,15 @@ install_all_native := $(install_all_arch) $(install_all_indep)
 install_all := $(install_all_native) $(install_all_cross)
 
 
-# wxPython uses this to build in-tree
-wxconfig     := $(shell pwd)/$(objdir_gtk_shared)/wx-config --no_rpath
-wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config --no_rpath
 
-# and this after it is installed.
+#---------------------------------------------------------------------------
-py_wxconfig  := wx-config $(PY_WX_CONFIG_OPTIONS) --debug=no
+# Setup Rules:
-pyd_wxconfig := wx-config $(PY_WX_CONFIG_OPTIONS) --debug
 
-
+debian/control: debian/control.in debian/rules
-#contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*)))
+	sed -e 's/=V/$(release)/g;                                          '\
-
+'               s/=SOV/$(sorelease)/g;                                      '\
-
+'               s/=U/$(unicode_suffix)/g;                                   '\
-# The Rules:
+'               s/=PY_BUILD_DEPS/$(PY_BUILD_DEPS)/g                         '\
-
-debian/python-version:
-	echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@
-
-debian/control: $(addprefix debian/,control.in python-version)
-	sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g;s/=U/$(unicode_suffix)/g'\
 		< debian/control.in > debian/control
 
 control-files-stamp: debian/control
@@ -315,21 +342,13 @@ control-files-stamp: debian/control
 	done;
 	@for f in docs postinst prerm; do                                    \
 		echo "generating control file $(package_gtk_py_lib).$$f";    \
-		sed -e 's/=PY/$(python_ver)/g;                              '\
+		sed -e 's/=PYVERS/$(PYVERS)/g;                              '\
 '			s|=WXPYDIR|$(wxpydir)|g;                            '\
 '			s/=V/$(release)/g;                                  '\
 '			s/=PRIO/$(alt_prio)/g'                               \
 			< debian/python-wxgtk.$$f                            \
 			> debian/$(package_gtk_py_lib).$$f;                  \
 	done;
-	@for f in postinst prerm; do                                         \
-		echo "generating control file $(package_gtk_dbg_py).$$f";    \
-		sed -e 's/=PY/$(python_ver)/g;                              '\
-'			s/=V/$(release)/g;                                  '\
-'			s/=PRIO/$(alt_prio)/g'                               \
-			< debian/python-wxgtk-dbg.$$f                        \
-			> debian/$(package_gtk_dbg_py).$$f;                  \
-	done;
 	@echo "generating control file $(package_gtk_dbg_py).docs";
 	@cp debian/python-wxgtk.docs debian/$(package_gtk_dbg_py).docs;
 	@for f in docs doc-base; do                                          \
@@ -367,6 +386,9 @@ control-files-stamp: debian/control
 			> debian/lintian-override;                           \
 	touch $@
 
+#---------------------------------------------------------------------------
+# wx Build rules
+
 build_arch: control-files-stamp $(build_arch_stamps)
 build_all: control-files-stamp $(build_stamps_native)
 
@@ -383,7 +405,10 @@ build: build_arch
 # libwxbase.  We need to configure it here in order to get the correct
 # config files to use it alone, but there is no point building it as the
 # wxgtk build is going to do that again anyway.  We'll move the relevant
-# files out when that is done.
+# files out when that is done.  
+#
+# TODO: Is this still necessary?  Can we just take the wxbase files
+# from the wxgui build now without special treatment?
 
 configure-wxbase-shared-stamp:
 	dh_testdir
@@ -450,33 +475,17 @@ build-gtk-debug-contrib-stamp: build-gtk-debug-stamp
 	touch $@
 
 
-purge-dbg-py:
-	@if [ ! -e build-gtk-py-stamp ]; then				\
-		$(MAKE) -f debian/rules clean-py;			\
-	fi
-	$(RM) build-gtk-dbg-py-stamp
-
-build-gtk-py-stamp: build-gtk-shared-stamp purge-dbg-py
-	dh_testdir
-	touch docs/lgpl.txt
-	cd wxPython \
-		&& $(python_ver) ./setup.py 	build			\
-						WX_CONFIG='$(wxconfig)'	\
-						WXPORT=$(pytoolkit)	\
-						$(PY_UNICODE)		\
-					    	FLAVOUR=$(DEBIAN_WXFLAVOUR)
-	touch $@
-
 build-doc-stamp: build-gtk-shared-stamp
 	dh_testdir
 	# the tarball may already have the generated docs in it
-	if [ ! -e docs/html/wx/index.html ]; then \
+	@if [ ! -e docs/html/wx/index.html ]; then \
+		echo Generating docs...; \
 		cd $(objdir_gtk_shared)/utils/tex2rtf/src && $(FAST_MAKE); \
 		cd -; \
 		rm -rf $(objdir_doc); \
 		rm -rf $(objdir_doc_cruft); \
-		mkdir $(objdir_doc); \
+		mkdir -p $(objdir_doc); \
-		mkdir $(objdir_doc_cruft); \
+		mkdir -p $(objdir_doc_cruft); \
 		cd $(objdir_doc_cruft); \
 		LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \
 		   ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf           \
@@ -488,7 +497,8 @@ build-doc-stamp: build-gtk-shared-stamp
 		rm -rf $(objdir_doc_cruft); \
 		rm -f $(objdir_doc)/wx$(release)-manual.{con,hh*,htx,ref}; \
 	else \
-		mkdir $(objdir_doc); \
+		echo Copying docs...; \
+		mkdir -p $(objdir_doc); \
 		cp docs/html/wx/* $(objdir_doc); \
 		mv $(objdir_doc)/index.html $(objdir_doc)/wx-$(release)-manual_contents.html; \
 	fi
@@ -531,23 +541,59 @@ build-i18n-stamp: build-gtk-shared-stamp
 		&& $(MAKE) allmo
 	touch $@
 
-purge-release-py:
+#---------------------------------------------------------------------------
-	@if [ ! -e build-gtk-dbg-py-stamp ]; then			\
+# wxPython build rules
-		$(MAKE) -f debian/rules clean-py;			\
-	fi
-	$(RM) build-gtk-py-stamp
 
-build-gtk-dbg-py-stamp: build-gtk-debug-stamp purge-release-py
+# wxPython uses this to build in-tree
-	dh_testdir
+wxconfig     := $(shell pwd)/$(objdir_gtk_shared)/wx-config --no_rpath
-	touch docs/lgpl.txt
+wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config --no_rpath
-	cd wxPython							\
+
-		&& $(python_ver) ./setup.py build			\
+# and this after it is installed.
-					    WX_CONFIG='$(wxconfig-dbg)' \
+py_wxconfig  := wx-config $(PY_WX_CONFIG_OPTIONS) --debug=no
-					    WXPORT=$(pytoolkit)		\
+pyd_wxconfig := wx-config $(PY_WX_CONFIG_OPTIONS) --debug
-					    $(PY_UNICODE)		\
+
-					    FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg
+
+
+build-gtk-py-stamp: build-gtk-shared-contrib-stamp $(PYVERS:%=build-gtk-py%-stamp)
 	touch $@
 
+# Notice the make magic here with the % sign.  In effect this
+# duplicates this rule for every matching dependency, and then the
+# value of the match can be used in the recipe as $*.  The
+# $(PYVERS...) substitution above gives us one dependency for every
+# version of Python that we are supporting.
+
+build-gtk-py%-stamp:
+	dh_testdir
+	touch docs/lgpl.txt
+	cd wxPython && 							\
+		python$* ./setup.py  build				\
+			WX_CONFIG='$(wxconfig)'				\
+			WXPORT=$(pytoolkit)				\
+			$(PY_UNICODE)					\
+			$(PY_OPENGL)					\
+			FLAVOUR=$(DEBIAN_WXFLAVOUR)
+	touch $@
+
+
+build-gtk-dbg-py-stamp: build-gtk-debug-contrib-stamp $(PYVERS:%=build-gtk-dbg-py%-stamp)
+	touch $@
+
+build-gtk-dbg-py%-stamp:
+	dh_testdir
+	touch docs/lgpl.txt
+	cd wxPython && 							\
+		python$*-dbg  ./setup.py build				\
+		    WX_CONFIG='$(wxconfig-dbg)' 			\
+		    WXPORT=$(pytoolkit)					\
+		    $(PY_UNICODE)					\
+		    $(PY_OPENGL)					\
+		    FLAVOUR=$(DEBIAN_WXFLAVOUR)
+	touch $@
+
+
+#---------------------------------------------------------------------------
+# MSW cross build rules
 
 configure-msw-shared-stamp:
 	dh_testdir
@@ -599,16 +645,12 @@ build-msw-dbg-stamp: configure-msw-dbg-stamp
 	cd $(objdir_msw_dbg) && $(FAST_MAKE)
 	touch $@
 
+#---------------------------------------------------------------------------
+# Cleaning rules
 
 clean-py:
-	cd wxPython && rm -rf licence build* docs/xml-raw wx/*.py
+	cd wxPython && rm -rf licence build* docs/xml-raw wx/*.py src/__version__.py
 
-	# What to do about src/__version__.py ???
-
-
-# We do the equivalent of this above by removing build, unfortunately
-# its not enough by itself to get the tree properly clean again.
-#		&& ./setup.py clean
 
 clean: debian/control clean-py
 	dh_testdir
@@ -635,6 +677,12 @@ clean: debian/control clean-py
 	rm -f debian/$(package_msw_dbg).*
 	rm -f debian/lintian-override
 	rm -f debian/unpack_examples.sh
+	find -name '*.py[co]' | xargs -r rm -f
+	rm -rf include/wx-$(release)
+
+
+#---------------------------------------------------------------------------
+# wx Install Rules
 
 install_arch: build_arch $(install_all_arch)
 
@@ -712,97 +760,6 @@ install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp
 	cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
 
-install-gtk-py-lib: DH_OPTIONS=-p$(package_gtk_py_lib)
-install-gtk-py-lib: build-gtk-py-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs usr/lib/wx/python
-	cd wxPython 								\
-		&& $(python_ver) ./setup.py install 				\
-			      --prefix=`pwd`/../debian/$(package_gtk_py_lib)/usr \
-			      WX_CONFIG='$(wxconfig)'				\
-			      SYS_WX_CONFIG='$(py_wxconfig)'			\
-			      WXPORT=$(pytoolkit)				\
-			      $(PY_UNICODE)					\
-			      FLAVOUR=$(DEBIAN_WXFLAVOUR)
-
-	mv debian/$(package_gtk_py_lib)/$(pydir)/wx.pth 			\
-	   debian/$(package_gtk_py_lib)/usr/lib/wx/python/wx$(release).pth
-
-	find debian/$(package_gtk_py_lib)/$(pydir) -name '*.py?' -exec rm '{}' ';'
-
-	# This is rather bogus, its included in the main copyright file now though.
-	rm -f debian/$(package_gtk_py_lib)/$(wxpydir)/wx/tools/XRCed/license.txt
-
-install-gtk-py-ver: DH_OPTIONS=-p$(package_gtk_py_ver)
-install-gtk-py-ver: install-gtk-py-lib
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-ifndef DEBIAN_WX_DEFAULT_VERSION
-
-	dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) $(pydir)/wxversion.py
-else
-	rm debian/$(package_gtk_py_lib)/$(pydir)/wxversion.py
-endif
-
-
-
-install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools)
-install-gtk-py-tools: install-gtk-py-ver
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-ifndef DEBIAN_WX_DEFAULT_VERSION
-
-	dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) usr/bin
-
-	dh_installman debian/wxPython-tools.1
-	dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1     \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1    \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1    \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1    \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1    \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1      \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1  \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1     \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywxrc.1
-
-	dh_installdirs usr/share/lintian/overrides
-	cp debian/lintian-override debian/$(package_gtk_py_tools)/usr/share/lintian/overrides/$(package_gtk_py_tools)
-endif
-	mkdir -p debian/$(package_gtk_py_tools)/usr/share/pixmaps
-	mkdir -p debian/$(package_gtk_py_tools)/usr/share/applications
-
-	cp wxPython/wx/py/PyCrust_32.png        debian/$(package_gtk_py_tools)/usr/share/pixmaps/pycrust.png
-	cp wxPython/wx/py/PyCrust_32.png        debian/$(package_gtk_py_tools)/usr/share/pixmaps/pyshell.png
-	cp wxPython/wx/tools/XRCed/XRCed_32.png debian/$(package_gtk_py_tools)/usr/share/pixmaps/xrced.png
-	cp debian/pycrust.desktop               debian/$(package_gtk_py_tools)/usr/share/applications
-	cp debian/pyshell.desktop               debian/$(package_gtk_py_tools)/usr/share/applications
-	cp debian/xrced.desktop                 debian/$(package_gtk_py_tools)/usr/share/applications
-
-	rm -r debian/$(package_gtk_py_lib)/usr/bin
-
-install-gtk-py-addons: DH_OPTIONS=-p$(package_gtk_py_addons)
-install-gtk-py-addons: install-gtk-py-tools
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-ifndef DEBIAN_WX_DEFAULT_VERSION
-
-	dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) $(pydir)/wxaddons
-else
-	rm -r debian/$(package_gtk_py_lib)/$(pydir)/wxaddons
-endif
-
-
-install-gtk-py: install-gtk-py-addons
-
 
 install-common: DH_OPTIONS=-p$(package_common)
 install-common: install-gtk-shared-stamp
@@ -836,7 +793,13 @@ install-headers: install-gtk-shared-stamp
 
 #	dh_movefiles --sourcedir=$(objdir_univ_install)
 	dh_install $(objdir_gtk_install)/include 	usr
-	
+
+	# TODO:  Should probably use setup.py's install of the wxPython headers...
+	mkdir -p debian/$(package_headers)/usr/include/wx-$(release)/wx/wxPython
+	cp -p wxPython/include/wx/wxPython/*.h \
+	    debian/$(package_headers)/usr/include/wx-$(release)/wx/wxPython/
+
+
 install-i18n: DH_OPTIONS=-p$(package_i18n)
 install-i18n: build-i18n-stamp install-gtk-shared-stamp
 	dh_testdir
@@ -844,47 +807,163 @@ install-i18n: build-i18n-stamp install-gtk-shared-stamp
 	dh_clean -k
 	dh_install $(objdir_gtk_install)/share/locale 	usr/share
 
+
 install-doc: DH_OPTIONS=-p$(package_doc)
 install-doc: build-doc-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
+	dh_install $(objdir_doc) usr/share/doc/$(package_doc)
 
 	@# Link this monstrosity with an overly obfuscated name
 	@# to something that both people and browsers can expect to find.
 	dh_link usr/share/doc/$(package_doc)/wx-manual.html/wx-$(release)-manual_contents.html \
 		usr/share/doc/$(package_doc)/wx-manual.html/index.html
 
+
 install-examples: DH_OPTIONS=-p$(package_examples)
 install-examples: build-examples-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 
-install-gtk-dbg-py: DH_OPTIONS=-p$(package_gtk_dbg_py)
+
-install-gtk-dbg-py: build-gtk-dbg-py-stamp
+#---------------------------------------------------------------------------
+# wxPython install rules
+
+install-gtk-py-lib: DH_OPTIONS=-p$(package_gtk_py_lib)
+install-gtk-py-lib: build-gtk-py-stamp install-gtk-py-lib-prereq $(PYVERS:%=install-gtk-py%-lib)
+
+install-gtk-py-lib-prereq:
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs usr/lib/wx/python
-	cd wxPython 								\
-		&& $(python_ver) ./setup.py install 				\
-			      --prefix=`pwd`/../debian/$(package_gtk_dbg_py)/usr \
-			      WX_CONFIG='$(wxconfig-dbg)'			\
-			      SYS_WX_CONFIG='$(pyd_wxconfig)'			\
-			      WXPORT=$(pytoolkit)				\
-			      $(PY_UNICODE)					\
-			      FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg
 
-	mv debian/$(package_gtk_py_lib)/$(pydir)/wx.pth 			\
+# More makefile magic here to duplicate this rule for all supported Python versions
-	   debian/$(package_gtk_py_lib)/usr/lib/wx/python/wx$(release)-dbg.pth
+install-gtk-py%-lib: 
+	dh_installdirs usr/lib/wx/python$*
+	cd wxPython && 								\
+		python$* ./setup.py install 					\
+	        	--prefix=`pwd`/../debian/$(package_gtk_py_lib)/usr	\
+		        WX_CONFIG='$(wxconfig)'					\
+			SYS_WX_CONFIG='$(py_wxconfig)'				\
+	        	WXPORT=$(pytoolkit)					\
+			$(PY_UNICODE)						\
+			$(PY_OPENGL)						\
+			FLAVOUR=$(DEBIAN_WXFLAVOUR)
 
-	find debian/$(package_gtk_dbg_py)/$(pydir) -name '*.py?' -exec rm '{}' ';'
+	mv debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages/wx.pth	\
-	rm -rf usr/bin $(pydir)/{wxversion.py,wx.pth}
+	       debian/$(package_gtk_py_lib)/usr/lib/wx/python$*/wx$(release).pth
 
-	# This is rather bogus, its included in the main copyright file now though.
+	find debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages	\
-	rm -f debian/$(package_gtk_dbg_py)/$(wxpydir)/wx/tools/XRCed/license.txt
+		-name '*.py?' -exec rm '{}' ';'
 
+	rm -f debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages/$(wxpydir)/wx/tools/XRCed/license.txt
+
+ifndef DEBIAN_WX_DEFAULT_VERSION
+	@# Move files out for the wxversion package
+	DH_OPTIONS=-p$(package_gtk_py_ver)					\
+		 dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) 		\
+				usr/lib/python$*/site-packages/wxversion.py		
+endif
+	rm -f debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages/wxversion.py
+	rm -f debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages/wxPython_common*.egg-info
+
+ifndef DEBIAN_WX_DEFAULT_VERSION
+	@# Move files out for the wxaddons package
+	DH_OPTIONS=-p$(package_gtk_py_addons) 					\
+		dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) 		\
+			usr/lib/python$*/site-packages/wxaddons
+
+	if [ -e debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages/wxaddons-$(full_version).egg-info ]; then \
+		DH_OPTIONS=-p$(package_gtk_py_addons) 				\
+			dh_movefiles --sourcedir=debian/$(package_gtk_py_lib)	\
+			usr/lib/python$*/site-packages/wxaddons-$(full_version).egg-info; \
+	fi
+endif
+	rm -rf debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages/wxaddons*
+
+
+
+install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools)
+install-gtk-py-tools: install-gtk-py-lib
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+ifndef DEBIAN_WX_DEFAULT_VERSION
+
+	dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) usr/bin
+
+	@# replace the pythonX.Y in the scripts with just python
+	for f in debian/$(package_gtk_py_tools)/usr/bin/*; do			\
+		sed '1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python\1,' $$f > $$f.tmp; \
+		mv $$f.tmp $$f;							\
+		chmod +x $$f;							\
+	done
+
+	dh_installman debian/wxPython-tools.1
+	dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1     \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1    \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1    \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1    \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1    \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1      \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1  \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1     \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywxrc.1
+
+	dh_installdirs usr/share/lintian/overrides
+	cp debian/lintian-override debian/$(package_gtk_py_tools)/usr/share/lintian/overrides/$(package_gtk_py_tools)
+
+	mkdir -p debian/$(package_gtk_py_tools)/usr/share/pixmaps
+	mkdir -p debian/$(package_gtk_py_tools)/usr/share/applications
+
+	cp wxPython/wx/py/PyCrust_32.png        debian/$(package_gtk_py_tools)/usr/share/pixmaps/pycrust.png
+	cp wxPython/wx/py/PyCrust_32.png        debian/$(package_gtk_py_tools)/usr/share/pixmaps/pyshell.png
+	cp wxPython/wx/tools/XRCed/XRCed_32.png debian/$(package_gtk_py_tools)/usr/share/pixmaps/xrced.png
+	cp debian/pycrust.desktop               debian/$(package_gtk_py_tools)/usr/share/applications
+	cp debian/pyshell.desktop               debian/$(package_gtk_py_tools)/usr/share/applications
+	cp debian/xrced.desktop                 debian/$(package_gtk_py_tools)/usr/share/applications
+
+endif
+	rm -r debian/$(package_gtk_py_lib)/usr/bin
+
+
+
+install-gtk-py: install-gtk-py-tools
+
+
+install-gtk-dbg-py: DH_OPTIONS=-p$(package_gtk_dbg_py)
+install-gtk-dbg-py: build-gtk-dbg-py-stamp install-gtk-dbg-py-prereq $(PYVERS:%=install-gtk-dbg-py%)
+
+install-gtk-dbg-py-prereq:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+install-gtk-dbg-py%:
+	dh_installdirs usr/lib/wx/pythnon$*
+	cd wxPython && 								\
+	    python$*-dbg  ./setup.py install					\
+	          --prefix=`pwd`/../debian/$(package_gtk_dbg_py)/usr 		\
+	          WX_CONFIG='$(wxconfig-dbg)'					\
+		  SYS_WX_CONFIG='$(pyd_wxconfig)'				\
+	          WXPORT=$(pytoolkit)						\
+		  $(PY_UNICODE)							\
+		  $(PY_OPENGL)							\
+		  FLAVOUR=$(DEBIAN_WXFLAVOUR)
+
+	# Remove all files but the *_d.so
+	find debian/$(package_gtk_dbg_py)					\
+		! -type d ! \( -name '*_d.so' -o -name '*.h' \) | xargs rm -f
+	find debian/$(package_gtk_dbg_py) -depth -empty -exec rmdir {} \;
+
+
+#---------------------------------------------------------------------------
+# MSW cross install rules
 
 install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
 install-msw-dev: build-msw-shared-stamp build-msw-static-stamp
@@ -951,52 +1030,72 @@ install-headers-msw:
 	dh_install $(objdir_msw_install)/include/wx-$(release)/wx/msw  usr/$(cross_host)/include/wx-$(release)/wx
 
 
-binary-common:
+#---------------------------------------------------------------------------
-	dh_testdir
+# Tying it all together
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs
-	dh_installexamples
-	dh_installmenu
-	dh_link
 
-	@# Don't strip debug libs at all, and strip cross libs elsewhere
-	@# with the cross host tools until dh_strip gets smarter.
-	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) \
-		 -N$(package_msw_dev) -N$(package_msw_dbg)
 
-	dh_compress
-	dh_fixperms
-
-	@# Don't do this for the dbg-py special build because dh_makeshlibs
-	@# will crap out if it is called with no packages to act on.
-	@if [ "x$(DH_OPTIONS)" != "-p$(package_gtk_dbg_py)" ]; then	\
-		echo "dh_makeshlibs -N$(package_gtk_py_lib) -V";	\
-		dh_makeshlibs -N$(package_gtk_py_lib) -V;		\
-	fi
-
-	dh_installdeb
-	dh_shlibdeps -ldebian/$(package_wxbase_lib)/usr/lib:debian/$(package_wxbase_dbg)/usr/lib:debian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-independent files here.
-# Note that you currently can't build the indep packages without first
-# building the arch specific package files needed to create them.
 binary-indep: build_all install
-	$(MAKE) -f debian/rules \
+	dh_testdir -i
-		DH_OPTIONS="-i $(addprefix -N,$(extra_packages))" \
+	dh_testroot -i
-		binary-common
+	dh_installdocs -i
+	dh_installchangelogs -i
+	dh_installexamples -i
+	dh_installmenu -i
+ifdef NO_PYCENTRAL
+	dh_python -i
+else
+	dh_pycentral -i
+endif
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
-# Build just the architecture-dependent files here.
+
+binary-arch: DH_OPTIONS=$(addprefix -N,$(extra_packages))
 binary-arch: build_arch install_arch
-	$(MAKE) -f debian/rules \
+	dh_testdir -a
-		DH_OPTIONS="-a $(addprefix -N,$(extra_packages))" \
+	dh_testroot -a
-		binary-common
+	dh_installdocs -a
+	dh_installchangelogs -a
+	dh_installexamples -a
+	dh_installmenu -a
+ifdef PY_DBG_OK
+	rm -rf debian/$(package_gtk_dbg_py)/usr/share/doc/$(package_gtk_dbg_py)
+	ln -s $(package_gtk_py_lib) debian/$(package_gtk_dbg_py)/usr/share/doc/$(package_gtk_dbg_py)
+else
+	rm -rf debian/$(package_gtk_dbg_py)
+endif
+ifdef NO_PYCENTRAL
+	dh_python -a
+else
+	dh_pycentral -a
+endif
+
+# Don't strip debug libs at all, and strip cross libs elsewhere
+# with the cross host tools until dh_strip gets smarter.
+	dh_strip -p$(package_gtk_py_lib) --dbg-package=$(package_gtk_dbg_py) 
+	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) \
+		 -N$(package_msw_dev) -N$(package_msw_dbg) \
+		 -N$(package_gtk_py_lib) -N$(package_gtk_dbg_py)
+
+	dh_link -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -N$(package_gtk_py_lib) -N$(package_gtk_dbg_py) -V
+	dh_installdeb -a
+	dh_shlibdeps -ldebian/$(package_wxbase_lib)/usr/lib:debian/$(package_wxbase_dbg)/usr/lib:debian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib
+	dh_gencontrol -a 
+	dh_md5sums -a
+	dh_builddeb -a
+
 
 # Build all packages target.
-binary: binary-arch binary-indep
+binary: binary-indep binary-arch 
+
 
 
 # This is a special target for building the wxMSW-cross packages.
@@ -1010,12 +1109,6 @@ binary-cross: control-files-stamp $(install_all_cross)
 		binary-common
 
 
-# Build wxPython against libwxgtk-dbg.  This package will conflict
-# with the release build one, but may be useful to some people.
-binary-dbg-py: control-files-stamp install-gtk-dbg-py
-	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg_py)" binary-common
-
-
 ############################################################################
 #
 # Some rules to build a subset of the complete list of packages that can be

distrib/mac/pbsetup-sh

@@ -49,10 +49,13 @@ if [ "${1}/../include/wx/mac/setup0.h" -nt "${1}/../include/wx/mac/setup.h" ] ;
     echo "${0}:${LINENO}: warning: edit or replace \"include/wx/mac/setup.h\" to integrate changes"
 fi
 #
-# Copy setup.h to setup.h if setup.h doesn't exist
+# Copy user setup.h to build setup.h if the latter doesn't exist or is older
 #
-cp "${1}/../include/wx/mac/setup.h" "${2}/include/wx/setup.h"
+if [ ! -f "${2}/include/wx/setup.h" -o \
-if [ ! -f "${2}/include/wx/setup.h" ] ; then
+     "${1}/../include/wx/mac/setup.h" -nt "${2}/include/wx/setup.h" ] ; then 
-    echo "${0}:${LINENO}: error: unable to create target setup file \"${2}/include/wx/setup.h\""
+    cp "${1}/../include/wx/mac/setup.h" "${2}/include/wx/setup.h"
-    exit 1
+    if [ ! -f "${2}/include/wx/setup.h" ] ; then
+        echo "${0}:${LINENO}: error: unable to create target setup file \"${2}/include/wx/setup.h\""
+        exit 1
+    fi
 fi

distrib/scripts/includes/configure_build.inc

@@ -19,46 +19,52 @@ UNICODE_OPTS="--enable-unicode"
 
 ANSI_OPTS="--enable-ansi"
 
-WXPYTHON_OPTS="--enable-monolithic \
+WXPYTHON_OPTS="--with-opengl \
-	--with-opengl \
+    --enable-sound --with-sdl \
-	--enable-sound \
+    --with-gnomeprint \
-        --enable-mediactrl \
+    --enable-graphics_ctx \
-	--enable-display \
+    --enable-mediactrl \
-	--enable-geometry \
+    --enable-display \
-	--enable-debug_flag \
+    --enable-geometry \
-	--enable-optimise \
+    --enable-debug_flag \
-	--disable-debugreport "
+    --enable-optimise \
+    --disable-debugreport \
+    --enable-monolithic"
 	
 	
 do_build(){
     OPTS=""
-    if [ "$WXPYTHON" == "1" ]; then
+    if [ "$WXPYTHON" = "1" ]; then
       OPTS="$WXPYTHON_OPTS"
     fi
     
-    if [ "$DEBUG" == "1" ]; then
+    if [ "$DEBUG" = "1" ]; then
       OPTS="$OPTS $DEBUG_OPTS "
     fi
     
-    if [ "$UNICODE" == "1" ]; then
+    if [ "$UNICODE" = "1" ]; then
       OPTS="$OPTS $UNICODE_OPTS "
     fi
     
     
     
-    if [ "$STATIC" == "1" ]; then
+    if [ "$STATIC" = "1" ]; then
       OPTS="$OPTS --enable-static"
     fi
     
     OPTS="$OPTS $OTHER_OPTS"
     
+    echo "$WXROOT/configure --prefix=$BUILDPREFIX $OPTS"
     $WXROOT/configure --prefix=$BUILDPREFIX $OPTS
     make
+    if [ $? != 0 ]; then
+        echo "wxWidgets build failed."        
+        exit $?
+    fi
     
     # build the libs wxPython needs
-    if [ "$WXPYTHON" == "1" ]; then
+    if [ "$WXPYTHON" = "1" ]; then
-      make -C contrib/src/animate
       make -C contrib/src/gizmos
       make -C contrib/src/stc
     fi
-}
+}

distrib/scripts/mac/lipo-dir.py

@@ -0,0 +1,54 @@
+import os, sys, shutil
+
+outputdir = "."
+ppc_basedir = "."
+intel_basedir = "."
+
+def lipo_walker(data, dirname, names):
+    global outputdir
+    global ppc_basedir
+    global intel_basedir
+    
+    for name in names:
+        fullpath = os.path.join(dirname, name)
+        intel_fullpath = fullpath.replace(ppc_basedir, intel_basedir)
+        outputfile = fullpath.replace(ppc_basedir, outputdir)
+        outdir = os.path.dirname(outputfile)
+        if not os.path.exists(outdir):
+            os.makedirs(outdir)
+        
+        # this call will only succeed if the file is a binary that can
+        # be lipoed.
+        if not os.path.islink(fullpath) and os.system("lipo -info %s" % fullpath) == 0:
+            if os.system("lipo -output %s -create %s %s" % (outputfile, fullpath, intel_fullpath)) == 0:
+                print "Successfully created %s" % outputfile
+        else:
+            if os.path.islink(fullpath):
+                linkto = os.readlink(fullpath)
+                
+                if linkto.startswith(ppc_basedir):
+                    linkto = linkto.replace(ppc_basedir, outputdir)
+                elif linkto.startswith(intel_basedir):
+                    linkto = linkto.replace(intel_basedir, outputdir)
+                
+                os.symlink(linkto, outputfile)
+            
+            elif not os.path.isdir(fullpath):
+                shutil.copy(fullpath, outputfile)
+            
+        
+if __name__ == "__main__":
+    if len(sys.argv) < 4:
+        print "Usage: %s <ppcdir> <inteldir> <outputdir>"
+        print ""
+        print "Takes a directory containing a Mac ppc application, and a directory"
+        print "containing a Mac intel application, and merges them into a universal"
+        print "binary."
+        sys.exit(1)
+        
+    ppc_basedir = sys.argv[1]
+    intel_basedir = sys.argv[2]
+    outputdir = sys.argv[3]
+        
+    os.path.walk(ppc_basedir, lipo_walker, None)
+    

distrib/scripts/mac/mac_options.inc

@@ -18,7 +18,7 @@ for i in "$@"; do
 	carbon)        PORT="mac" ;;
 	cocoa)         PORT="cocoa" ;;
 	static)        STATIC=1 ;;
-	*)
+	*)             
 	    usage
 	    exit
 	    ;;

distrib/scripts/mac/macbuild

@@ -2,7 +2,8 @@
 
 # you need to change this if you run from outside this dir. 
 if [ "$WXROOT" = "" ]; then
-  WXROOT=../../..
+  scriptDir="$(cd $(dirname $0);pwd)"
+  WXROOT=$scriptDir/../../..
 fi
 
 . $WXROOT/distrib/scripts/includes/configure_build.inc
@@ -13,16 +14,18 @@ fi
 # configure-based build scripts, which is why this looks a little empty.
 
 if [ "$UNIVERSAL" = "1" ]; then
-  OTHER_OPTS="--enable-universal_binary "
+  OTHER_OPTS="$OTHER_OPTS --enable-universal_binary --with-libjpeg=builtin --with-libpng=builtin"
 fi
 
+mkdir -p builds
+cd builds
 do_build
 
 make prefix=$INSTALLDIR install
 
 if [ "$WXPYTHON" == "1" ]; then
-  make -C contrib/src/gizmos prefix=$INSTALLDIR install
+    make -C contrib/src/gizmos prefix=$INSTALLDIR install
-  make -C contrib/src/stc prefix=$INSTALLDIR install
+    make -C contrib/src/stc prefix=$INSTALLDIR install
-fi
+fi 
 
 cd $OLDDIR

distrib/scripts/mac/macbuild-lipo

@@ -2,65 +2,53 @@
 
 # you need to change this if you run from outside this dir. 
 if [ "$WXROOT" = "" ]; then
-  WXROOT=../../..
+  scriptDir="$(cd $(dirname $0);pwd)"
+  WXROOT=$scriptDir/../../..
 fi
 
 . $WXROOT/distrib/scripts/includes/configure_build.inc
 
 . $WXROOT/distrib/scripts/mac/mac_options.inc
 
-DIR="bld-ppc"
+OTHER_OPTS="$OTHER_OPTS --disable-precomp-headers"
 
-export CXX="g++-3.3 -arch ppc"
+do_lipo_build(){
-export CC="gcc-3.3 -arch ppc"
+    DIR="bld-$1"
-mkdir -p $DIR
-cd $DIR
-do_build
-cd ..
-
-# Do another build, but with i386 this time
-DIR="bld-i386"
-
-export CXX="g++-4.0 -arch i386"
-export CC="gcc-4.0 -arch i386"
-mkdir -p  $DIR
-cd $DIR
-do_build
-cd ..
-
-# Copy over everything, then remove files we need to replace with lipo'd versions  
-mkdir -p bld
-cp -R bld-i386/* bld
-cp -R bld-i386/.pch bld/.pch
-rm bld/lib/*.dylib
-
-# lipo the files, but make sure not to run it on symbolic links  
-for item in `cd bld-i386/lib; ls *.dylib`
-do
-  if [ -f bld-i386/lib/$item -a ! -L bld-i386/lib/$item ]; then
-      lipo -create bld-i386/lib/$item bld-ppc/lib/$item -output bld/lib/$item
-  else
-      cp -R bld-i386/lib/$item bld/lib
-  fi    
-done
-  
-# make install hacks - the copy operations mess up the timestamps and thus
-# cause make to erroneously think that the libraries need rebuilt
-touch bld/.pch/wxprec_monodll/wx/*.gch
-touch bld/.pch/wxprec_gldll/wx/*.gch
-touch bld/*.o
-touch bld/lib/*
     
-# one more hack - inplace wx-config has a hardcoded path in it - we need to 
+    if [ "$1" = "ppc" ]; then
-# change that path from bld-i386 to just bld in case someone wants to build things
+        export CXX="g++-3.3 -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030"
-# in tree. (wxPython does this, for example)
+        export CC="gcc-3.3 -arch ppc -DMAC_OS_X_VERSION_MAX_ALLOWED=1030"
-python -c "import os; fname = os.path.abspath('bld/wx-config'); data = open(fname).read(); data = data.replace('bld-i386', 'bld'); open(fname, 'w').write(data)"
+        export MACOSX_DEPLOYMENT_TARGET=10.3
+    else
+        export CXX="g++-4.0 -arch i386"
+        export CC="gcc-4.0 -arch i386"
+        export MACOSX_DEPLOYMENT_TARGET=10.4
+    fi
+    
+    mkdir -p $DIR
+    cd $DIR
+    do_build
 
-cd bld
+    mkdir -p $INSTALLDIR/$1
-make prefix=$INSTALLDIR install
+    
+    make prefix=$INSTALLDIR/$1 install
 
-if [ "$WXPYTHON" == "1" ]; then
+    if [ "$WXPYTHON" == "1" ]; then
-  make -C contrib/src/animate prefix=$INSTALLDIR install
+        make -C contrib/src/gizmos prefix=$INSTALLDIR/$1 install
-  make -C contrib/src/gizmos prefix=$INSTALLDIR install
+        make -C contrib/src/stc prefix=$INSTALLDIR/$1 install
-  make -C contrib/src/stc prefix=$INSTALLDIR install
+    fi
+
+    cd ..
+}
+
+do_lipo_build "ppc"
+do_lipo_build "i386"
+
+python $WXROOT/distrib/scripts/mac/lipo-dir.py $INSTALLDIR/ppc $INSTALLDIR/i386 $INSTALLDIR    
+
+rm -rf $INSTALLDIR/ppc $INSTALLDIR/i386
+python -c "import os; fname = os.path.abspath('$INSTALLDIR/bin/wx-config'); data = open(fname).read(); data = data.replace('ppc/', ''); open(fname, 'w').write(data)"
+
+if [ $? != 0 ]; then
+    exit $?
 fi

distrib/scripts/unix/unixbuild

@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# you need to change this if you run from outside this dir. 
 if [ "$WXROOT" = "" ]; then
-  WXROOT=../../..
+  scriptDir="$(cd $(dirname $0);pwd)"
+  WXROOT=$scriptDir/../../..
 fi
 
 . $WXROOT/distrib/scripts/includes/configure_build.inc
@@ -20,28 +20,33 @@ for i in "$@"; do
     ansi)          UNICODE=0 ;;
     debug)         DEBUG=1 ;;
     wxpython)      WXPYTHON=1 ;;
-	gtk2)          PORT="gtk2" ;;
+    gtk2)          PORT="gtk2" ;;
-	gtk)           PORT="gtk" ;;
+    gtk)           PORT="gtk" ;;
-	x11)           PORT="x11" ;;
+    x11)           PORT="x11" ;;
-	motif)         PORT="motif" ;;
+    motif)         PORT="motif" ;;
-	static)        STATIC=1 ;;
+    static)        STATIC=1 ;;
-	*)
+    *)
-	    usage
+        usage
-	    exit
+        exit
-	    ;;
+        ;;
     esac
 done
 
-OTHER_OPTS="--with-$PORT "
+if [ "$PORT" != "" ]; then
+    OTHER_OPTS="--with-$PORT "
+fi
 
 do_build
 
-make prefix=$INSTALLDIR install
+if [ $? != 0 ]; then
-
+    exit $?
-if [ "$WXPYTHON" == "1" ]; then
-  make -C contrib/src/animate prefix=$INSTALLDIR install
-  make -C contrib/src/gizmos prefix=$INSTALLDIR install
-  make -C contrib/src/stc prefix=$INSTALLDIR install
 fi
 
-cd $OLDDIR
+make prefix=$INSTALLDIR install
+
+if [ "$WXPYTHON" = "1" ]; then
+    make -C contrib/src/gizmos prefix=$INSTALLDIR install
+    make -C contrib/src/stc prefix=$INSTALLDIR install
+fi
+
+cd $OLDDIR

docs/changes.txt

@@ -88,71 +88,128 @@ Major new features in 2.8 release
   wxSearchCtrl, wxAboutBox, wxTreebook, tar streams.
 
 
+2.8.5
+-----
+
+All (GUI):
+
+- Added colour normalization to PNM image handler (Ray Johnston).
+- Fixed selecting part of word from right to left in wxHTML (Michael Hieke).
+- Selecting text in wxHTML with character precision was made easier, it's
+  enough to select half of a character (Michael Hieke).
+- Significantly improved startup times of XRC-based applications using
+  embedded resources on Unix (requires resources recompilation).
+- Fixed freeing of "static" alpha data in wxImage (Axel Gembe).
+- Added tab mouse click events to wxAuiNotebook (Ben Williams).
+- Option for middle-click tab close in wxAuiNotebook (Ben Williams).
+- Added wxAuiNotebook::SetFont, GetTabCtrlHeight, GetHeightForPageHeight.
+- Added SetBitmap/GetBitmap to wxWizard, to allow e.g. on-the-fly creation
+  of bitmap to fit page height.
+- Fixed wxXPMHandler::SaveFile for images with more than 92 colors.
+- Fixed a crash in wxGrid on creation due to OnSize being called too soon.
+
+wxMSW:
+
+- Fix crash when destroying a default button (Tim Kosse).
+- Correct problem with page setup dialog when using landscape mode.
+- Added msw.font.no-proof-quality system option, see manual for description.
+- Fix appearance of notebook with non-top tabs under Windows Vista.
+- Fixed bug with symbol resolving in wxStackWalker (Axel Gembe).
+- Fixed showing busy cursor for disabled windows and during wxExecute()
+
+wxGTK:
+
+- Fixed missing key events in wxGTK1 build.
+- Setting foreground colour of single line wxTextCtrl now works.
+- More work on setting defaults in GNOME print dialogs.
+- Also made landscape printing work as per wxMSW.
+- Add support for (rectangular) clipping in GNOME print backend.
+- Speed up wxBitmap::Rescale().
+- Add right button event for wxToolbar's tools (Tim Kosse).
+- Made wxWindow::SetScrollPos and wxScrollbar::SetThumbPos
+  not emit any event.
+- Correct hyperactive mouse wheel support.
+- Correct grid line mode in wxListCtrl.
+- Don't unconditionally add wxCAPTION style to wxMiniFrame.
+- Fixed crash in file and dir pickers for GTK+ < 2.6 if compiled
+  with GTK+ >= 2.6.
+- Generate wxEVT_COMMAND_LIST_END_LABEL_EDIT event even if label didn't change
+
+wxMac:
+
+- Fixed ability of non-native/installed toolbars to have controls,
+  in native toolbar compilation mode.
+
+wxMotif:
+
+- Fix crash when using wxStaticBox with empty label
+
+
 2.8.4
 -----
 
 All:
 
-- Fix bug in wxFileConfig when recreating a group (Steven Van Ingelgem)
+- Fix bug in wxFileConfig when recreating a group (Steven Van Ingelgem).
 - Fix wxStringOutputStream::Write() in Unicode build when the argument
-  overlaps UTF-8 characters boundary
+  overlaps UTF-8 characters boundary.
-- Account for lines without newline at the end in wxExecute()
+- Account for lines without newline at the end in wxExecute().
 - Added wxString::char_str(), wchar_str(), From8BitData(), To8BitData(),
   FromUTF8(), ToUTF8() and utf8_str() methods for forward compatiblity
-  with wxWidgets 3
+  with wxWidgets 3.
 
 All (Unix):
 
-- Handle socket shutdown by the peer correctly in wxSocket (Tim Kosse)
+- Handle socket shutdown by the peer correctly in wxSocket (Tim Kosse).
 
 All (GUI):
 
-- Allow status bar children in XRC (Edmunt Pienkowski)
+- Allow status bar children in XRC (Edmunt Pienkowski).
-- Fix memory leak in wxWizard when not using sizers for the page layout
+- Fix memory leak in wxWizard when not using sizers for the page layout.
-- Added wxListCtrl::SetItemPtrData()
+- Added wxListCtrl::SetItemPtrData().
-- wxHTML: Apply table background colour between the cells too (Michael Hieke)
+- wxHTML: Apply table background colour between the cells too (Michael Hieke).
 
 wxMSW:
 
 - Corrected wxStaticBox label appearance when its foreground colour was set:
-  it didn't respect font size nor background colour then (Juan Antonio Ortega)
+  it didn't respect font size nor background colour then (Juan Antonio Ortega).
-- Don't lose combobox text when it's opened and closed (Kolya Kosenko)
+- Don't lose combobox text when it's opened and closed (Kolya Kosenko).
-- Corrected GetChecked() for events from checkable menu items (smanders)
+- Corrected GetChecked() for events from checkable menu items (smanders).
-- Fixed popup menus under Windows NT 4
+- Fixed popup menus under Windows NT 4.
-- Fixed bug in wxThread::Wait() in console applications introduced in 2.8.3
+- Fixed bug in wxThread::Wait() in console applications introduced in 2.8.3.
-- Support right-aligned/centered owner drawn items in wxListCtrl (troelsk)
+- Support right-aligned/centered owner drawn items in wxListCtrl (troelsk).
-- Compilation fixed with WXWIN_COMPATIBILITY_2_6==0
+- Compilation fixed with WXWIN_COMPATIBILITY_2_6==0.
-- Fix wxComboCtrl colours under Windows Vista (Kolya Kosenko)
+- Fix wxComboCtrl colours under Windows Vista (Kolya Kosenko).
 
 wxGTK:
 
-- Fix infinite loop when adding a wxStaticText control to a toolbar
+- Fix infinite loop when adding a wxStaticText control to a toolbar.
-- Fix wxNO_BORDER style for wxRadioBox (David Hart)
+- Fix wxNO_BORDER style for wxRadioBox (David Hart).
-- wxComboBox::SetValue() doesn't emit EVT_TEXT anymore
+- wxComboBox::SetValue() doesn't emit EVT_TEXT anymore.
-- Fix wxTextCtrl::GetLineText() for empty lines (Marcin Wojdyr)
+- Fix wxTextCtrl::GetLineText() for empty lines (Marcin Wojdyr).
-- Fix support for wxFD_FILE_MUST_EXIST in wxFileDialog
+- Fix support for wxFD_FILE_MUST_EXIST in wxFileDialog.
 - Fix support for setting orientation, paper size and collate
-  in GNOME print backend
+  in GNOME print backend.
 - Support wxTEXT_ALIGNMENT_JUSTIFIED in wxTextCtrl if GTK+ version is at
-  least 2.11 (Mart Raudsepp).
+  least 2.11 (Mart Raudsepp)..
 
 wxMac:
 
-- Fix wxComboBox::SetSelection(wxNOT_FOUND) (Adrian Secord)
+- Fix wxComboBox::SetSelection(wxNOT_FOUND) (Adrian Secord).
 
 wxUniv:
 
-- Fix wxTextCtrl::SetSelection(-1, -1) to behave as documented (Anders Larsen)
+- Fix wxTextCtrl::SetSelection(-1, -1) to behave as documented (Anders Larsen).
-- Fix wxComboBox::SetSelection(wxNOT_FOUND)
+- Fix wxComboBox::SetSelection(wxNOT_FOUND).
-- Fix setting background colour for controls with transparent background
+- Fix setting background colour for controls with transparent background.
 
 2.8.3
 -----
 
 All:
 
-- Shut down the sockets gracefully (Sergio Aguayo)
+- Shut down the sockets gracefully (Sergio Aguayo).
-- Fix extra indentation in wxHTML_ALIGN_JUSTIFY display (Chacal)
+- Fix extra indentation in wxHTML_ALIGN_JUSTIFY display (Chacal).
 
 wxMac
 
@@ -166,7 +223,7 @@ wxMSW:
 
 wxGTK:
 
-- Fixed handling of accelerators using PageUp/Down keys
+- Fixed handling of accelerators using PageUp/Down keys.
 
 
 2.8.2
@@ -187,9 +244,9 @@ All:
 - Fixed tab-related drawing and hit-testing bugs in wxRichTextCtrl.
 - Implemented background colour in wxRichTextCtrl.
 - Fixed crashes in helpview when opening a file.
-- Fixed detection of number of processors under Linux 2.6
+- Fixed detection of number of processors under Linux 2.6.
-- Fixed Base64 computation in wxHTTP (p_michalczyk)
+- Fixed Base64 computation in wxHTTP (p_michalczyk).
-- Fix handling of wxSOCKET_REUSEADDR in wxDatagramSocket (troelsk)
+- Fix handling of wxSOCKET_REUSEADDR in wxDatagramSocket (troelsk).
 
 Unix Ports:
 

docs/latex/wx/auinotebook.tex

@@ -81,6 +81,13 @@ Deletes a page at the given index.  Calling this method will generate a page cha
 
 Returns the associated art provider.
 
+\membersection{wxAuiNotebook::GetHeightForPageHeight}\label{wxauinotebookgetheightforpageheight}
+
+\func{int}{GetHeightForPageHeight}{\param{int }{pageHeight}}
+
+Returns the desired height of the notebook for the given page height. Use this to fit the notebook to
+a given page size.
+
 \membersection{wxAuiNotebook::GetPage}\label{wxauinotebookgetpage}
 
 \constfunc{wxWindow*}{GetPage}{\param{size\_t }{page\_idx}}
@@ -118,6 +125,12 @@ Returns the tab label for the page.
 
 Returns the currently selected page.
 
+\membersection{wxAuiNotebook::GetTabCtrlHeight}\label{wxauinotebookgettabctrlheight}
+
+\constfunc{int}{GetTabCtrlHeight}{\void}
+
+Returns the height of the tab control.
+
 \membersection{wxAuiNotebook::InsertPage}\label{wxauinotebookinsertpage}
 
 \func{bool}{InsertPage}{\param{size\_t }{page\_idx}, \param{wxWindow* }{page}, \param{const wxString\& }{caption}, \param{bool }{select = false}, \param{const wxBitmap\& }{bitmap = wxNullBitmap}}
@@ -137,6 +150,30 @@ Removes a page, without deleting the window pointer.
 
 Sets the art provider to be used by the notebook.
 
+\membersection{wxAuiNotebook::SetFont}\label{wxauinotebooksetfont}
+
+\func{bool}{SetFont}{\param{const wxFont\& }{font}}
+
+Sets the font for drawing the tab labels, using a bold version of the font for selected tab labels.
+
+\membersection{wxAuiNotebook::SetNormalFont}\label{wxauinotebooksetnormalfont}
+
+\func{void}{SetNormalFont}{\param{const wxFont\& }{font}}
+
+Sets the font for drawing unselected tab labels.
+
+\membersection{wxAuiNotebook::SetSelectedFont}\label{wxauinotebooksetselectedfont}
+
+\func{void}{SetSelectedFont}{\param{const wxFont\& }{font}}
+
+Sets the font for drawing selected tab labels.
+
+\membersection{wxAuiNotebook::SetMeasuringFont}\label{wxauinotebooksetmeasuringfont}
+
+\func{void}{SetMeasuringFont}{\param{const wxFont\& }{font}}
+
+Sets the font for measuring tab labels.
+
 \membersection{wxAuiNotebook::SetPageBitmap}\label{wxauinotebooksetpagebitmap}
 
 \func{bool}{SetPageBitmap}{\param{size\_t }{page}, \param{const wxBitmap\& }{bitmap}}

docs/latex/wx/cmdevent.tex

@@ -181,7 +181,7 @@ that has longer life time than the event object.
 
 \membersection{wxCommandEvent::SetExtraLong}\label{wxcommandeventsetextralong}
 
-\func{void}{SetExtraLong}{\param{int}{ extraLong}}
+\func{void}{SetExtraLong}{\param{long}{ extraLong}}
 
 Sets the {\bf m\_extraLong} member.
 

docs/latex/wx/config.tex

@@ -378,7 +378,11 @@ this is not present, but required, the application name will be used instead.}
 \docparam{style}{Can be one of wxCONFIG\_USE\_LOCAL\_FILE and
 wxCONFIG\_USE\_GLOBAL\_FILE. The style interpretation depends on the config
 class and is ignored by some implementations. For wxFileConfig, these styles
-determine whether a local or global config file is created or used. If the
+determine whether a local or global config file is created or used: if
+wxCONFIG\_USE\_GLOBAL\_FILE is used, then settings are read from the global
+config file and if wxCONFIG\_USE\_LOCAL\_FILE is used, settings are read from
+and written to local config file (if they are both set, global file is read
+first, then local file, overwriting global settings). If the
 flag is present but the parameter is empty, the parameter will be set to a
 default. If the parameter is present but the style flag not, the relevant flag
 will be added to the style. For wxRegConfig, thie GLOBAL flag refers to HKLM

docs/latex/wx/fs_mem.tex

@@ -78,10 +78,6 @@ Constructor.
 
 \func{static void}{AddFile}{\param{const wxString\& }{filename}, \param{const wxBitmap\& }{bitmap}, \param{long }{type}}
 
-\func{static void}{AddFile}{\param{const wxString\& }{filename}, \param{const wxString\& }{textdata}}
-
-\func{static void}{AddFile}{\param{const wxString\& }{filename}, \param{const void* }{binarydata}, \param{size\_t }{size}}
-
 Add file to list of files stored in memory. Stored 
 data (bitmap, text or raw data)
 will be copied into private memory stream and available under 
@@ -92,6 +88,26 @@ Note that you must use a \arg{type} value (aka image format)
 that wxWidgets can save (e.g. JPG, PNG, see \helpref{wxImage
 documentation}{wximage})!
 
+\wxheading{See also}
+
+\helpref{AddFileWithMimeType}{wxmemoryfshandleraddfilewithmimetype}
+
+
+\membersection{wxMemoryFSHandler::AddFileWithMimeType}\label{wxmemoryfshandleraddfilewithmimetype}
+
+\func{static void}{AddFileWithMimeType}{\param{const wxString\& }{filename}, \param{const wxString\& }{textdata}, \param{const wxString\& }{mimetype}}
+
+\func{static void}{AddFileWithMimeType}{\param{const wxString\& }{filename}, \param{const void* }{binarydata}, \param{size\_t }{size}, \param{const wxString\& }{mimetype}}
+
+Like \helpref{AddFile}{wxmemoryfshandleraddfile}, but lets you explicitly
+specify added file's MIME type. This version should be used whenever you know
+the MIME type, because it makes accessing the files faster.
+
+\newsince{2.8.5}
+
+\wxheading{See also}
+
+\helpref{AddFile}{wxmemoryfshandleraddfile}
 
 \membersection{wxMemoryFSHandler::RemoveFile}\label{wxmemoryfshandlerremovefile}
 

docs/latex/wx/hteasypr.tex

@@ -38,6 +38,26 @@ Constructor.
 
 \docparam{parentWindow}{pointer to the window that will own the preview frame and setup dialogs. May be NULL.}
 
+\membersection{wxHtmlEasyPrinting::GetParentWindow}\label{wxhtmleasyprintinggetparentwindow}
+
+\constfunc{wxWindow*}{GetParentWindow}{\void}
+
+Gets the parent window for dialogs.
+
+\membersection{wxHtmlEasyPrinting::GetPrintData}\label{wxhtmleasyprintinggetprintdata}
+
+\func{wxPrintData*}{GetPrintData}{\void}
+
+Returns pointer to \helpref{wxPrintData}{wxprintdata} instance used by this class. You can
+set its parameters (via SetXXXX methods).
+
+\membersection{wxHtmlEasyPrinting::GetPageSetupData}\label{wxhtmleasyprintinggetpagesetupdata}
+
+\func{wxPageSetupDialogData*}{GetPageSetupData}{\void}
+
+Returns a pointer to \helpref{wxPageSetupDialogData}{wxpagesetupdialogdata} instance used by 
+this class. You can set its parameters (via SetXXXX methods).
+
 \membersection{wxHtmlEasyPrinting::PreviewFile}\label{wxhtmleasyprintingpreviewfile}
 
 \func{bool}{PreviewFile}{\param{const wxString\& }{htmlfile}}
@@ -132,17 +152,9 @@ Set page footer. The following macros can be used inside it:
 
 \docparam{pg}{one of wxPAGE\_ODD, wxPAGE\_EVEN and wxPAGE\_ALL constants.}
 
-\membersection{wxHtmlEasyPrinting::GetPrintData}\label{wxhtmleasyprintinggetprintdata}
+\membersection{wxHtmlEasyPrinting::SetParentWindow}\label{wxhtmleasyprintingsetparentwindow}
 
-\func{wxPrintData*}{GetPrintData}{\void}
+\func{void}{SetParentWindow}{\param{wxWindow*}{ window}}
 
-Returns pointer to \helpref{wxPrintData}{wxprintdata} instance used by this class. You can
+Sets the parent window for dialogs.
-set its parameters (via SetXXXX methods).
-
-\membersection{wxHtmlEasyPrinting::GetPageSetupData}\label{wxhtmleasyprintinggetpagesetupdata}
-
-\func{wxPageSetupDialogData*}{GetPageSetupData}{\void}
-
-Returns a pointer to \helpref{wxPageSetupDialogData}{wxpagesetupdialogdata} instance used by 
-this class. You can set its parameters (via SetXXXX methods).
 

docs/latex/wx/hthlpfrm.tex

@@ -186,7 +186,7 @@ the embedded window to be destroyed independently of the help controller.
 
 \func{}{wxHtmlHelpWindow}{\param{wxHtmlHelpData* }{data = NULL}}
 
-\func{}{wxHtmlHelpWindow}{\param{wxWindow* }{parent}, \param{int }{wxWindowID}, \param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\&}{ pos = wxDefaultSize}, \param{int }{style = wxTAB\_TRAVERSAL|wxTAB\_wxNO_BORDER}, \param{int }{helpStyle = wxHF\_DEFAULT\_STYLE}, \param{wxHtmlHelpData* }{data = NULL}}
+\func{}{wxHtmlHelpWindow}{\param{wxWindow* }{parent}, \param{int }{wxWindowID}, \param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\&}{ pos = wxDefaultSize}, \param{int }{style = wxTAB\_TRAVERSAL|wxTAB\_wxNO\_BORDER}, \param{int }{helpStyle = wxHF\_DEFAULT\_STYLE}, \param{wxHtmlHelpData* }{data = NULL}}
 
 Constructor.
 
@@ -194,7 +194,7 @@ Constructor. For the values of {\it helpStyle}, please see the documentation for
 
 \membersection{wxHtmlHelpWindow::Create}\label{wxhtmlhelpwindowcreate}
 
-\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\&}{ pos = wxDefaultSize}, \param{int }{style = wxTAB\_TRAVERSAL|wxTAB\_wxNO_BORDER}, \param{int }{helpStyle = wxHF\_DEFAULT\_STYLE}, \param{wxHtmlHelpData* }{data = NULL}}
+\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\&}{ pos = wxDefaultSize}, \param{int }{style = wxTAB\_TRAVERSAL|wxTAB\_wxNO\_BORDER}, \param{int }{helpStyle = wxHF\_DEFAULT\_STYLE}, \param{wxHtmlHelpData* }{data = NULL}}
 
 Creates the help window. See \helpref{the constructor}{wxhtmlhelpwindowwxhtmlhelpwindow}
 for a description of the parameters.

docs/latex/wx/log.tex

@@ -434,6 +434,13 @@ target but the log messages are also passed to the previous log target if any.
 
 Destroys the previous log target.
 
+\membersection{wxLogChain::DetachOldLog}\label{wxlogchaindetacholdlog}
+
+\func{void}{DetachOldLog}{\void}
+
+Detaches the old log target so it won't be destroyed when the wxLogChain object
+is destroyed.
+
 \membersection{wxLogChain::GetOldLog}\label{wxlogchaingetoldlog}
 
 \constfunc{wxLog *}{GetOldLog}{\void}

docs/latex/wx/mimetype.tex

@@ -51,6 +51,7 @@ No base class.
 
 \latexignore{\rtfignore{\wxheading{Function groups}}}
 
+
 \membersection{Helper functions}\label{mimehelperfunctions}
 
 All of these functions are static (i.e. don't need a wxMimeTypesManager object
@@ -60,6 +61,7 @@ types using wxString functions.
 
 \helpref{IsOfType}{wxmimetypesmanagerisoftype}
 
+
 \membersection{Constructor and destructor}\label{mimeconstructordestructor}
 
 NB: You won't normally need to use more than one wxMimeTypesManager object in a
@@ -68,16 +70,18 @@ program.
 \helpref{wxMimeTypesManager}{wxmimetypesmanagerctor}\\
 \helpref{\destruct{wxMimeTypesManager}}{wxmimetypesmanagerdtor}
 
+
 \membersection{Query database}\label{mimequerydatabase}
 
 These functions are the heart of this class: they allow to find a \helpref{file type}{wxfiletype} object
 from either file extension or MIME type.
 If the function is successful, it returns a pointer to the wxFileType object
-which {\bf must} be deleted by the caller, otherwise NULL will be returned.
+which {\bf must} be deleted by the caller, otherwise \NULL will be returned.
 
 \helpref{GetFileTypeFromMimeType}{wxmimetypesmanagergetfiletypefrommimetype}\\
 \helpref{GetFileTypeFromExtension}{wxmimetypesmanagergetfiletypefromextension}
 
+
 \membersection{Initialization functions}\label{wxmimetypesmanagerinit}
 
 {\bf Unix:} These functions may be used to load additional files (except for the
@@ -95,6 +99,7 @@ information in either mailcap(5) or mime.types(5) format.
 
 }}
 
+
 \membersection{wxMimeTypesManager::wxMimeTypesManager}\label{wxmimetypesmanagerctor}
 
 \func{}{wxMimeTypesManager}{\void}
@@ -103,12 +108,14 @@ Constructor puts the object in the "working" state, no additional initialization
 are needed - but \helpref{ReadXXX}{wxmimetypesmanagerinit} may be used to load
 additional mailcap/mime.types files.
 
+
 \membersection{wxMimeTypesManager::\destruct{wxMimeTypesManager}}\label{wxmimetypesmanagerdtor}
 
 \func{}{\destruct{wxMimeTypesManager}}{\void}
 
 Destructor is not virtual, so this class should not be derived from.
 
+
 \membersection{wxMimeTypesManager::AddFallbacks}\label{wxmimetypesmanageraddfallbacks}
 
 \func{void}{AddFallbacks}{\param{const wxFileTypeInfo *}{fallbacks}}
@@ -120,22 +127,28 @@ and extensions that might not be present in the system MIME database.
 
 Please see the typetest sample for an example of using it.
 
+
 \membersection{wxMimeTypesManager::GetFileTypeFromExtension}\label{wxmimetypesmanagergetfiletypefromextension}
 
 \func{wxFileType*}{GetFileTypeFromExtension}{\param{const wxString\&}{ extension}}
 
 Gather information about the files with given extension and return the
-corresponding \helpref{wxFileType}{wxfiletype} object or NULL if the extension
+corresponding \helpref{wxFileType}{wxfiletype} object or \NULL if the extension
 is unknown.
 
+The \arg{extension} parameter may have, or not, the leading dot, if it has it,
+it is stripped automatically. It must not however be empty.
+
+
 \membersection{wxMimeTypesManager::GetFileTypeFromMimeType}\label{wxmimetypesmanagergetfiletypefrommimetype}
 
 \func{wxFileType*}{GetFileTypeFromMimeType}{\param{const wxString\&}{ mimeType}}
 
 Gather information about the files with given MIME type and return the
-corresponding \helpref{wxFileType}{wxfiletype} object or NULL if the MIME type
+corresponding \helpref{wxFileType}{wxfiletype} object or \NULL if the MIME type
 is unknown.
 
+
 \membersection{wxMimeTypesManager::IsOfType}\label{wxmimetypesmanagerisoftype}
 
 \func{bool}{IsOfType}{\param{const wxString\&}{ mimeType}, \param{const wxString\&}{ wildcard}}
@@ -148,6 +161,7 @@ same as {\it wildcard} or if it has the same category and the subtype of
 The comparison don by this function is case insensitive so it is not
 necessary to convert the strings to the same case before calling it.
 
+
 \membersection{wxMimeTypesManager::ReadMailcap}\label{wxmimetypesmanagerreadmailcap}
 
 \func{bool}{ReadMailcap}{\param{const wxString\&}{ filename}, \param{bool}{ fallback = false}}
@@ -165,6 +179,7 @@ will not happen if this parameter is set to true (default is false).
 The return value is true if there were no errors in the file or false
 otherwise.
 
+
 \membersection{wxMimeTypesManager::ReadMimeTypes}\label{wxmimetypesmanagerreadmimetypes}
 
 \func{bool}{ReadMimeTypes}{\param{const wxString\&}{ filename}}

docs/latex/wx/richtextctrl.tex

@@ -1356,7 +1356,7 @@ See also \helpref{wxRichTextCtrl::NumberList}{wxrichtextctrlnumberlist}, \helpre
 Sets the selection to the given range.
 
 The end point of range is specified as the last character position of the span of text, plus one.
-So, for example, to set the style for a character at position 5, use the range (5,6).
+So, for example, to set the selection for a character at position 5, use the range (5,6).
 
 \membersection{wxRichTextCtrl::SetSelectionRange}\label{wxrichtextctrlsetselectionrange}
 
@@ -1365,7 +1365,7 @@ So, for example, to set the style for a character at position 5, use the range (
 Sets the selection to the given range.
 
 The end point of range is specified as the last character position of the span of text, plus one.
-So, for example, to set the style for a character at position 5, use the range (5,6).
+So, for example, to set the selection for a character at position 5, use the range (5,6).
 
 \membersection{wxRichTextCtrl::SetStyle}\label{wxrichtextctrlsetstyle}
 

docs/latex/wx/richtextstyleorganiserdialog.tex

@@ -34,7 +34,7 @@ To specify the operations available to the user, pass a combination of these val
 \twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_APPLY\_STYLES}}{Provides a button for applying the currently selected style to the selection.}
 \twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_EDIT\_STYLES}}{Provides a button for editing styles.}
 \twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_RENAME\_STYLES}}{Provides a button for renaming styles.}
-\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_OK\_CANCEL}}{Provides OK can Cancel buttons.}
+\twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_OK\_CANCEL}}{Provides OK and Cancel buttons.}
 \twocolitem{\windowstyle{wxRICHTEXT\_ORGANISER\_RENUMBER}}{Provides a checkbox for specifying that the selection should be renumbered.}
 \end{twocollist}
 

docs/latex/wx/statbmp.tex

@@ -89,7 +89,7 @@ be called even if \helpref{SetIcon}{wxstaticbitmapseticon} had been used.
 \helpref{wxStaticBitmap::SetBitmap}{wxstaticbitmapsetbitmap}
 
 
-\membersection{wxStaticIcon::GetIcon}\label{wxstaticbitmapgeticon}
+\membersection{wxStaticBitmap::GetIcon}\label{wxstaticbitmapgeticon}
 
 \constfunc{wxIcon}{GetIcon}{\void}
 
@@ -100,7 +100,7 @@ can't be retrieved from the control if a bitmap had been set (using
 
 \wxheading{See also}
 
-\helpref{wxStaticIcon::SetIcon}{wxstaticbitmapseticon}
+\helpref{wxStaticBitmap::SetIcon}{wxstaticbitmapseticon}
 
 
 \membersection{wxStaticBitmap::SetBitmap}\label{wxstaticbitmapsetbitmap}
@@ -118,7 +118,7 @@ Sets the bitmap label.
 \helpref{wxStaticBitmap::GetBitmap}{wxstaticbitmapgetbitmap}
 
 
-\membersection{wxStaticIcon::SetIcon}\label{wxstaticbitmapseticon}
+\membersection{wxStaticBitmap::SetIcon}\label{wxstaticbitmapseticon}
 
 \func{virtual void}{SetIcon}{\param{const wxIcon\& }{ label}}
 
@@ -130,5 +130,5 @@ Sets the label to the given icon.
 
 \wxheading{See also}
 
-\helpref{wxStaticIcon::GetIcon}{wxstaticbitmapgeticon}
+\helpref{wxStaticBitmap::GetIcon}{wxstaticbitmapgeticon}
 

docs/latex/wx/sysopt.tex

@@ -31,6 +31,11 @@ Setting this to 0 causes more flicker, but allows applications to paint graphics
 \twocolitem{msw.display.directdraw}{If set to 1, use DirectDraw-based implementation of
 \helpref{wxDisplay}{wxdisplay}. By default the standard Win32 functions are
 used.}
+\twocolitem{msw.font.no-proof-quality}{If set to 1, use default fonts quality
+instead of proof quality when creating fonts. With proof quality the fonts
+have slightly better appearance but not all fonts are available in this
+quality, e.g. the Terminal font in small sizes is not and this option may be
+used if wider fonts selection is more important than higher quality.}
 \end{twocollist}
 
 \wxheading{Mac}

docs/latex/wx/wizard.tex

@@ -157,6 +157,11 @@ This is useful if the decision about which pages to show is taken during
 run-time, as in this case, the wizard won't be able to get to all pages starting
 from a single one and you should call {\it Fit} separately for the others.
 
+\membersection{wxWizard::GetBitmap}\label{wxwizardgetbitmap}
+
+\constfunc{const wxBitmap\&}{GetBitmap}{\void}
+
+Returns the bitmap used for the wizard.
 
 \membersection{wxWizard::GetCurrentPage}\label{wxwizardgetcurrentpage}
 
@@ -241,6 +246,11 @@ Executes the wizard starting from the given page, returning {\tt true} if it was
 successfully finished or {\tt false} if user cancelled it. The {\it firstPage} 
 can not be {\tt NULL}.
 
+\membersection{wxWizard::SetBitmap}\label{wxwizardsetbitmap}
+
+\func{void}{SetBitmap}{\param{const wxBitmap\& }{bitmap}}
+
+Sets the bitmap used for the wizard.
 
 \membersection{wxWizard::SetPageSize}\label{wxwizardsetpagesize}
 

include/wx/aui/auibook.h

@@ -45,13 +45,14 @@ enum wxAuiNotebookOption
     wxAUI_NB_CLOSE_BUTTON        = 1 << 10,
     wxAUI_NB_CLOSE_ON_ACTIVE_TAB = 1 << 11,
     wxAUI_NB_CLOSE_ON_ALL_TABS   = 1 << 12,
-    
+    wxAUI_NB_MIDDLE_CLICK_CLOSE  = 1 << 13,
-    
+
     wxAUI_NB_DEFAULT_STYLE = wxAUI_NB_TOP |
                              wxAUI_NB_TAB_SPLIT |
                              wxAUI_NB_TAB_MOVE |
                              wxAUI_NB_SCROLL_BUTTONS |
-                             wxAUI_NB_CLOSE_ON_ACTIVE_TAB
+                             wxAUI_NB_CLOSE_ON_ACTIVE_TAB |
+                             wxAUI_NB_MIDDLE_CLICK_CLOSE
 };
 
 
@@ -82,10 +83,10 @@ public:
 
     void SetSelection(int s) { selection = s; m_commandInt = s; }
     int GetSelection() const { return selection; }
-    
+
     void SetOldSelection(int s) { old_selection = s; }
     int GetOldSelection() const { return old_selection; }
-    
+
     void SetDragSource(wxAuiNotebook* s) { drag_source = s; }
     wxAuiNotebook* GetDragSource() const { return drag_source; }
 
@@ -138,13 +139,13 @@ public:
 
     wxAuiTabArt() { }
     virtual ~wxAuiTabArt() { }
-    
+
     virtual wxAuiTabArt* Clone() = 0;
     virtual void SetFlags(unsigned int flags) = 0;
 
     virtual void SetSizingInfo(const wxSize& tab_ctrl_size,
                                size_t tab_count) = 0;
-                               
+
     virtual void SetNormalFont(const wxFont& font) = 0;
     virtual void SetSelectedFont(const wxFont& font) = 0;
     virtual void SetMeasuringFont(const wxFont& font) = 0;
@@ -161,8 +162,8 @@ public:
                          int close_button_state,
                          wxRect* out_tab_rect,
                          wxRect* out_button_rect,
-                         int* x_extent) = 0;     
+                         int* x_extent) = 0;
-    
+
     virtual void DrawButton(
                          wxDC& dc,
                          wxWindow* wnd,
@@ -171,7 +172,7 @@ public:
                          int button_state,
                          int orientation,
                          wxRect* out_rect) = 0;
-    
+
     virtual wxSize GetTabSize(
                          wxDC& dc,
                          wxWindow* wnd,
@@ -180,18 +181,18 @@ public:
                          bool active,
                          int close_button_state,
                          int* x_extent) = 0;
-                         
+
     virtual int ShowDropDown(
                          wxWindow* wnd,
                          const wxAuiNotebookPageArray& items,
                          int active_idx) = 0;
-                         
+
     virtual int GetIndentSize() = 0;
-    
+
     virtual int GetBestTabCtrlSize(
                          wxWindow* wnd,
                          const wxAuiNotebookPageArray& pages,
-                         const wxSize& required_bmp_size) = 0;    
+                         const wxSize& required_bmp_size) = 0;
 };
 
 
@@ -202,7 +203,7 @@ public:
 
     wxAuiDefaultTabArt();
     virtual ~wxAuiDefaultTabArt();
-    
+
     wxAuiTabArt* Clone();
     void SetFlags(unsigned int flags);
     void SetSizingInfo(const wxSize& tab_ctrl_size,
@@ -216,7 +217,7 @@ public:
                  wxDC& dc,
                  wxWindow* wnd,
                  const wxRect& rect);
-                     
+
     void DrawTab(wxDC& dc,
                  wxWindow* wnd,
                  const wxAuiNotebookPage& pane,
@@ -225,7 +226,7 @@ public:
                  wxRect* out_tab_rect,
                  wxRect* out_button_rect,
                  int* x_extent);
-    
+
     void DrawButton(
                  wxDC& dc,
                  wxWindow* wnd,
@@ -234,9 +235,9 @@ public:
                  int button_state,
                  int orientation,
                  wxRect* out_rect);
-    
+
     int GetIndentSize();
-                 
+
     wxSize GetTabSize(
                  wxDC& dc,
                  wxWindow* wnd,
@@ -245,7 +246,7 @@ public:
                  bool active,
                  int close_button_state,
                  int* x_extent);
-                  
+
     int ShowDropDown(
                  wxWindow* wnd,
                  const wxAuiNotebookPageArray& items,
@@ -253,7 +254,7 @@ public:
 
     int GetBestTabCtrlSize(wxWindow* wnd,
                  const wxAuiNotebookPageArray& pages,
-                 const wxSize& required_bmp_size);  
+                 const wxSize& required_bmp_size);
 
 protected:
 
@@ -272,7 +273,7 @@ protected:
     wxBitmap m_disabled_right_bmp;
     wxBitmap m_active_windowlist_bmp;
     wxBitmap m_disabled_windowlist_bmp;
-    
+
     int m_fixed_tab_width;
     int m_tab_ctrl_height;
     unsigned int m_flags;
@@ -286,7 +287,7 @@ public:
 
     wxAuiSimpleTabArt();
     virtual ~wxAuiSimpleTabArt();
-    
+
     wxAuiTabArt* Clone();
     void SetFlags(unsigned int flags);
 
@@ -301,7 +302,7 @@ public:
                  wxDC& dc,
                  wxWindow* wnd,
                  const wxRect& rect);
-                                          
+
     void DrawTab(wxDC& dc,
                  wxWindow* wnd,
                  const wxAuiNotebookPage& pane,
@@ -310,7 +311,7 @@ public:
                  wxRect* out_tab_rect,
                  wxRect* out_button_rect,
                  int* x_extent);
-    
+
     void DrawButton(
                  wxDC& dc,
                  wxWindow* wnd,
@@ -319,9 +320,9 @@ public:
                  int button_state,
                  int orientation,
                  wxRect* out_rect);
-             
+
     int GetIndentSize();
-    
+
     wxSize GetTabSize(
                  wxDC& dc,
                  wxWindow* wnd,
@@ -330,7 +331,7 @@ public:
                  bool active,
                  int close_button_state,
                  int* x_extent);
-                  
+
     int ShowDropDown(
                  wxWindow* wnd,
                  const wxAuiNotebookPageArray& items,
@@ -338,7 +339,7 @@ public:
 
     int GetBestTabCtrlSize(wxWindow* wnd,
                  const wxAuiNotebookPageArray& pages,
-                 const wxSize& required_bmp_size);  
+                 const wxSize& required_bmp_size);
 
 protected:
 
@@ -358,7 +359,7 @@ protected:
     wxBitmap m_disabled_right_bmp;
     wxBitmap m_active_windowlist_bmp;
     wxBitmap m_disabled_windowlist_bmp;
-    
+
     int m_fixed_tab_width;
     unsigned int m_flags;
 };
@@ -405,7 +406,7 @@ public:
     void SetMeasuringFont(const wxFont& measuring_font);
     void DoShowHide();
     void SetRect(const wxRect& rect);
-    
+
     void RemoveButton(int id);
     void AddButton(int id,
                    int location,
@@ -414,7 +415,7 @@ public:
 
     size_t GetTabOffset() const;
     void SetTabOffset(size_t offset);
-    
+
 protected:
 
     virtual void Render(wxDC* dc, wxWindow* wnd);
@@ -444,7 +445,11 @@ public:
                  long style = 0);
 
     ~wxAuiTabCtrl();
-    
+
+#if wxABI_VERSION >= 20805
+    bool IsDragging() const { return m_is_dragging; }
+#endif
+
 protected:
 
     void OnPaint(wxPaintEvent& evt);
@@ -452,11 +457,17 @@ protected:
     void OnSize(wxSizeEvent& evt);
     void OnLeftDown(wxMouseEvent& evt);
     void OnLeftUp(wxMouseEvent& evt);
+#if wxABI_VERSION >= 20805
+    void OnMiddleDown(wxMouseEvent& evt);
+    void OnMiddleUp(wxMouseEvent& evt);
+    void OnRightDown(wxMouseEvent& evt);
+    void OnRightUp(wxMouseEvent& evt);
+#endif
     void OnMotion(wxMouseEvent& evt);
     void OnLeaveWindow(wxMouseEvent& evt);
     void OnButton(wxAuiNotebookEvent& evt);
 
-    
+
 protected:
 
     wxPoint m_click_pt;
@@ -494,14 +505,14 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0);
-                
+
     void SetWindowStyleFlag(long style);
     void SetArtProvider(wxAuiTabArt* art);
     wxAuiTabArt* GetArtProvider() const;
-    
+
     virtual void SetUniformBitmapSize(const wxSize& size);
     virtual void SetTabCtrlHeight(int height);
- 
+
     bool AddPage(wxWindow* page,
                  const wxString& caption,
                  bool select = false,
@@ -515,7 +526,7 @@ public:
 
     bool DeletePage(size_t page);
     bool RemovePage(size_t page);
-    
+
     size_t GetPageCount() const;
     wxWindow* GetPage(size_t page_idx) const;
     int GetPageIndex(wxWindow* page_wnd) const;
@@ -535,13 +546,33 @@ public:
     const wxAuiManager& GetAuiManager() const { return m_mgr; }
 #endif
 
+#if wxABI_VERSION >= 20805
+    // Sets the normal font
+    void SetNormalFont(const wxFont& font);
+
+    // Sets the selected tab font
+    void SetSelectedFont(const wxFont& font);
+
+    // Sets the measuring font
+    void SetMeasuringFont(const wxFont& font);
+
+    // Sets the tab font
+    virtual bool SetFont(const wxFont& font);
+
+    // Gets the tab control height
+    int GetTabCtrlHeight() const;
+
+    // Gets the height of the notebook for a given page height
+    int GetHeightForPageHeight(int pageHeight);
+#endif
+
 protected:
 
     // these can be overridden
     virtual void UpdateTabCtrlHeight();
     virtual int CalculateTabCtrlHeight();
     virtual wxSize CalculateNewSplitSize();
-    
+
 protected:
 
     void DoSizing();
@@ -552,7 +583,7 @@ protected:
     bool FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx);
     void RemoveEmptyTabFrames();
     void UpdateHintWindowSize();
-    
+
 protected:
 
     void OnChildFocus(wxChildFocusEvent& evt);
@@ -563,7 +594,13 @@ protected:
     void OnTabDragMotion(wxCommandEvent& evt);
     void OnTabEndDrag(wxCommandEvent& evt);
     void OnTabButton(wxCommandEvent& evt);
-    
+#if wxABI_VERSION >= 20805
+    void OnTabMiddleDown(wxCommandEvent& evt);
+    void OnTabMiddleUp(wxCommandEvent& evt);
+    void OnTabRightDown(wxCommandEvent& evt);
+    void OnTabRightUp(wxCommandEvent& evt);
+#endif
+
 protected:
 
     wxAuiManager m_mgr;
@@ -577,7 +614,7 @@ protected:
     wxFont m_selected_font;
     wxFont m_normal_font;
     int m_tab_ctrl_height;
-        
+
     int m_last_drag_x;
     unsigned int m_flags;
 
@@ -603,13 +640,19 @@ BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 0)
+#if wxABI_VERSION >= 20805
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 0)
+#endif
 END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&);
 
 #define wxAuiNotebookEventHandler(func) \
     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxAuiNotebookEventFunction, &func)
-    
+
 #define EVT_AUINOTEBOOK_PAGE_CLOSE(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_PAGE_CHANGED(winid, fn) \
@@ -627,6 +670,17 @@ typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&);
 #define EVT_AUINOTEBOOK_ALLOW_DND(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, winid, wxAuiNotebookEventHandler(fn))
 
+#if wxABI_VERSION >= 20805
+#define EVT_AUINOTEBOOK_TAB_MIDDLE_DOWN(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, winid, wxAuiNotebookEventHandler(fn))
+#define EVT_AUINOTEBOOK_TAB_MIDDLE_UP(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, winid, wxAuiNotebookEventHandler(fn))
+#define EVT_AUINOTEBOOK_TAB_RIGHT_DOWN(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, winid, wxAuiNotebookEventHandler(fn))
+#define EVT_AUINOTEBOOK_TAB_RIGHT_UP(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, winid, wxAuiNotebookEventHandler(fn))
+#endif
+
 #else
 
 // wxpython/swig event work

include/wx/cocoa/NSApplication.h

@@ -12,22 +12,57 @@
 #ifndef _WX_COCOA_NSAPPLICATION_H__
 #define _WX_COCOA_NSAPPLICATION_H__
 
+#include "wx/cocoa/objc/objc_uniquifying.h"
+
 // ========================================================================
 // wxNSApplicationDelegate
 // ========================================================================
+/*!
+    @class wxNSApplicationDelegate
+    @discussion Implements an NSApplication delegate which can respond to messages sent by Cocoa to change Cocoa's behavior.
+
+    wxCocoa will set a singleton instance of this class as the NSApplication delegate upon startup unless wxWidgets is running
+    in a "plugin" manner in which case it would not be appropriate to do this.
+
+    Although Cocoa will send notifications to the delegate it is also possible to register a different object to listen for
+    them.  Because we want to support the plugin case, we use a separate notification observer object when we can.
+*/
 @interface wxNSApplicationDelegate : NSObject
 {
 }
 
 // Delegate methods
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
+@end // interface wxNSApplicationDelegate : NSObject
+WX_DECLARE_GET_OBJC_CLASS(wxNSApplicationDelegate,NSObject)
+
+// ========================================================================
+// wxNSApplicationObserver
+// ========================================================================
+/*!
+    @class wxNSApplicationObserver
+    @discussion Observes most notifications sent by the NSApplication singleton.
+
+    wxCocoa will create a singleton instance of this class upon startup and register it with the default notification center to
+    listen for several events sent by the NSApplication singleton.
+
+    Because there can be any number of notification observers, this method allows wxCocoa to function properly even when it is
+    running as a plugin of some other (most likely not wxWidgets) application.
+*/
+@interface wxNSApplicationObserver : NSObject
+{
+}
+
+// Methods defined as (but not used here) as NSApplication delegate methods.
 - (void)applicationWillBecomeActive:(NSNotification *)notification;
 - (void)applicationDidBecomeActive:(NSNotification *)notification;
 - (void)applicationWillResignActive:(NSNotification *)notification;
 - (void)applicationDidResignActive:(NSNotification *)notification;
+- (void)applicationWillUpdate:(NSNotification *)notification;
 
 // Other notifications
 - (void)controlTintChanged:(NSNotification *)notification;
-@end // interface wxNSApplicationDelegate : NSObject
+@end // interface wxNSApplicationObserver : NSObject
+WX_DECLARE_GET_OBJC_CLASS(wxNSApplicationObserver,NSObject)
 
 #endif //ndef _WX_COCOA_NSAPPLICATION_H__

include/wx/cocoa/NSView.h

@@ -15,7 +15,12 @@
 #include "wx/hashmap.h"
 #include "wx/cocoa/ObjcAssociate.h"
 
+#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
+typedef struct CGRect NSRect;
+#else
 typedef struct _NSRect NSRect;
+#endif
+
 class wxWindow;
 
 WX_DECLARE_OBJC_HASHMAP(NSView);
@@ -32,6 +37,9 @@ public:
     virtual wxWindow* GetWxWindow() const
     {   return NULL; }
     virtual void Cocoa_FrameChanged(void) = 0;
+#if 0 // ABI incompatibility
+    virtual void Cocoa_synthesizeMouseMoved(void) = 0;
+#endif
     virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent)
     {   return false; }
     virtual bool Cocoa_drawRect(const NSRect &rect)
@@ -62,6 +70,12 @@ public:
     {   return false; }
     virtual bool Cocoa_resetCursorRects()
     {   return false; }
+#if 0 // ABI incompatibility
+    virtual bool Cocoa_viewDidMoveToWindow()
+    {   return false; }
+    virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow newWindow)
+    {   return false; }
+#endif
     virtual ~wxCocoaNSView() { }
 };
 

include/wx/cocoa/app.h

@@ -12,6 +12,11 @@
 #ifndef _WX_COCOA_APP_H_
 #define _WX_COCOA_APP_H_
 
+typedef struct __CFRunLoopObserver * CFRunLoopObserverRef;
+typedef const struct __CFString * CFStringRef;
+
+#include "wx/mac/corefoundation/cfref.h"
+
 // ========================================================================
 // wxApp
 // ========================================================================
@@ -26,7 +31,10 @@ class WXDLLEXPORT wxApp: public wxAppBase
 // ------------------------------------------------------------------------
 public:
     wxApp();
-    virtual ~wxApp() {}
+// ABI compatibility warning: This was implemented inline.  wxCocoa apps
+// compiled against < 2.8.5 won't call the new implementation which cleans up
+// the CFRunLoop idle observer.  Fortunately, Cleanup does that in 2.8.
+    virtual ~wxApp();
 
 // ------------------------------------------------------------------------
 // Cocoa specifics
@@ -37,6 +45,9 @@ public:
     virtual void CocoaDelegate_applicationDidBecomeActive();
     virtual void CocoaDelegate_applicationWillResignActive();
     virtual void CocoaDelegate_applicationDidResignActive();
+    /* The following two cannot be virtual due to 2.8 ABI compatibility */
+    /*virtual*/ void CocoaDelegate_applicationWillUpdate();
+    /*virtual*/ void CF_ObserveMainRunLoopBeforeWaiting(CFRunLoopObserverRef observer, int activity);
 protected:
     WX_NSApplication m_cocoaApp;
     struct objc_object *m_cocoaAppDelegate;
@@ -65,6 +76,8 @@ public:
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__
 
+    // Set true _before_ initializing wx to force embedded mode (no app delegate, etc.)
+    static bool sm_isEmbedded;
 private:
 #ifdef __WXDEBUG__
     bool m_isInAssert;

include/wx/cocoa/bitmap.h

@@ -43,6 +43,9 @@ public:
     // Construct a mask from a mono bitmap (copies the bitmap).
     wxMask(const wxBitmap& bitmap);
 
+    // Copy constructor
+    wxMask(const wxMask& src);
+
     virtual ~wxMask();
 
     bool Create(const wxBitmap& bitmap, const wxColour& colour);

include/wx/cocoa/checkbox.h

@@ -59,6 +59,8 @@ public:
     virtual void SetValue(bool);
     virtual bool GetValue() const;
     virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel() const;
+
 protected:
     virtual void DoSet3StateValue(wxCheckBoxState state);
     virtual wxCheckBoxState DoGet3StateValue() const;

include/wx/cocoa/control.h

@@ -61,8 +61,20 @@ public:
 
     // Enables the control
     virtual void CocoaSetEnabled(bool enable);
+
+    wxString GetLabel() const;
+    void SetLabel(const wxString& label);
 protected:
     virtual wxSize DoGetBestSize() const;
+
+    // Provides a common implementation of title setting which strips mnemonics
+    // and then calls setTitle: with the stripped string.  May be implemented
+    // to call setTitleWithMnemonic: on OpenStep-compatible systems.  Only
+    // intended for use by views or cells which implement at least setTitle:
+    // and possibly setTitleWithMnemonic: such as NSBox and NSButton or NSCell
+    // classes, for example as used by wxRadioBox.  Not usable with classes like
+    // NSTextField which expect setStringValue:.
+    static void CocoaSetLabelForObject(const wxString& labelWithWxMnemonic, struct objc_object *anObject);
 };
 
 #endif

include/wx/cocoa/dc.h

@@ -83,7 +83,7 @@ public:
     virtual void StartPage(void) {};
     virtual void EndPage(void) {};
 
-    virtual void SetFont(const wxFont& font) {}
+    virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
     virtual void SetBrush(const wxBrush& brush);
     virtual void SetBackground(const wxBrush& brush);

include/wx/cocoa/menu.h

@@ -73,6 +73,8 @@ private:
 // ========================================================================
 // wxMenuBar
 // ========================================================================
+// NOTE: wxCocoaNSMenu subclass is not needed but cannot be removed due to
+// ABI compatibility issues.  It is removed in trunk (2.9)
 class WXDLLEXPORT wxMenuBar : public wxMenuBarBase, public wxCocoaNSMenu
 {
 public:

include/wx/cocoa/objc/NSMenu.h

@@ -0,0 +1,28 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/cocoa/objc/NSMenu.h
+// Purpose:     WXNSMenu class
+// Author:      David Elliott
+// Modified by:
+// Created:     2007/04/20 (move from NSMenu.mm)
+// RCS-ID:      $Id$
+// Copyright:   (c) 2002 David Elliott
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef __WX_COCOA_OBJC_NSMENU_H__
+#define __WX_COCOA_OBJC_NSMENU_H__
+
+#import <AppKit/NSMenu.h>
+
+// ============================================================================
+// @class WXNSMenu
+// ============================================================================
+@interface WXNSMenu : NSMenu
+{
+}
+
+- (void)dealloc;
+
+@end // WXNSMenu
+
+#endif //ndef __WX_COCOA_OBJC_NSMENU_H__

include/wx/cocoa/objc/NSView.h

@@ -0,0 +1,45 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/cocoa/objc/NSView.h
+// Purpose:     WXNSView class
+// Author:      David Elliott
+// Modified by:
+// Created:     2007/04/20 (move from NSView.mm)
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003 David Elliott
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef __WX_COCOA_OBJC_NSVIEW_H__
+#define __WX_COCOA_OBJC_NSVIEW_H__
+
+#include "wx/cocoa/objc/objc_uniquifying.h"
+
+#import <AppKit/NSView.h>
+
+// ============================================================================
+// @class WXNSView
+// ============================================================================
+@interface WXNSView : NSView
+{
+}
+
+- (void)drawRect: (NSRect)rect;
+- (void)mouseDown:(NSEvent *)theEvent;
+- (void)mouseDragged:(NSEvent *)theEvent;
+- (void)mouseUp:(NSEvent *)theEvent;
+- (void)mouseMoved:(NSEvent *)theEvent;
+- (void)mouseEntered:(NSEvent *)theEvent;
+- (void)mouseExited:(NSEvent *)theEvent;
+- (void)rightMouseDown:(NSEvent *)theEvent;
+- (void)rightMouseDragged:(NSEvent *)theEvent;
+- (void)rightMouseUp:(NSEvent *)theEvent;
+- (void)otherMouseDown:(NSEvent *)theEvent;
+- (void)otherMouseDragged:(NSEvent *)theEvent;
+- (void)otherMouseUp:(NSEvent *)theEvent;
+- (void)resetCursorRects;
+- (void)viewDidMoveToWindow;
+- (void)viewWillMoveToWindow:(NSWindow *)newWindow;
+@end // WXNSView
+WX_DECLARE_GET_OBJC_CLASS(WXNSView,NSView)
+
+#endif //ndef __WX_COCOA_OBJC_NSVIEW_H__

include/wx/cocoa/objc/NSWindow.h

@@ -0,0 +1,36 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/cocoa/objc/NSWindow.h
+// Purpose:     WXNSWindow class
+// Author:      David Elliott
+// Modified by:
+// Created:     2007/04/20 (move from NSWindow.mm)
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003 David Elliott
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#import <AppKit/NSWindow.h>
+#import <AppKit/NSPanel.h>
+
+// ============================================================================
+// @class WXNSWindow
+// ============================================================================
+@interface WXNSWindow : NSWindow
+{
+}
+
+- (BOOL)canBecomeKeyWindow;
+- (BOOL)canBecomeMainWindow;
+@end // WXNSWindow
+
+// ============================================================================
+// @class WXNSPanel
+// ============================================================================
+@interface WXNSPanel : NSPanel
+{
+}
+
+- (BOOL)canBecomeKeyWindow;
+- (BOOL)canBecomeMainWindow;
+@end // WXNSPanel
+

include/wx/cocoa/objc/objc_uniquifying.h

@@ -0,0 +1,291 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/cocoa/objc/objc_uniquifying.h
+// Purpose:     Allows wxWidgets code to get a direct pointer to a compiled
+//              Objective-C class and provides a method to fix up the
+//              name to include a unique identifier (currently the address
+//              of the objc_class structure).
+// Author:      David Elliott <dfe@cox.net>
+// Modified by:
+// Created:     2007/05/15
+// RCS-ID:      $Id$
+// Copyright:   (c) 2007 Software 2000 Ltd.
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __WX_COCOA_OBJC_CLASS_H__
+#define __WX_COCOA_OBJC_CLASS_H__
+
+#if wxUSE_OBJC_UNIQUIFYING
+
+// objc_getClass and stuff
+#include <objc/objc-runtime.h>
+
+////////////// Objective-C uniquifying implementation //////////////
+
+template <typename ObjcType>
+class wxObjcClassInitializer;
+
+template <typename ObjcType>
+class UniquifiedName;
+
+template <typename ObjcType>
+class wxObjcCompilerInformation
+{
+    friend class wxObjcClassInitializer<ObjcType>;
+    friend class UniquifiedName<ObjcType>;
+private:
+    // GetCompiledClass must be partially specialized for an ObjcType
+    // If you're not using it, implement an inline returning NULL
+    inline static struct objc_class * GetCompiledClass();
+
+    // sm_theClassName must be partially specialized for each type
+    static const char sm_theClassName[];
+
+    // GetSuperclass must be specialized. Typically one of two ways:
+    // 1. objc_getClass("SomeRealClassName")
+    // 2. wxGetObjcClass_SomeWxClassName();
+    inline static struct objc_class *GetSuperclass();
+};
+
+
+template <typename ObjcType>
+struct UniquifiedName
+{
+    // We're going for OriginalClassName@ClassStructureAddress
+    // Therefore our size is the sizeof the original class name constant string (which includes the terminating NULL)
+    // plus the sizeof a pointer to struct objc_class times two (two hex digits for each byte) plus 3 for "@0x"
+    typedef char Type[sizeof(wxObjcCompilerInformation<ObjcType>::sm_theClassName) + (sizeof(struct objc_class*)<<1) + 3];
+    static void Init(Type m_theString, const objc_class *aClass)
+    {
+        snprintf(const_cast<char*>(m_theString), sizeof(Type), "%s@%p", wxObjcCompilerInformation<ObjcType>::sm_theClassName, aClass);
+    }
+};
+
+template <typename ObjcType>
+class wxObjcClassInitializer
+{
+public:
+    static struct objc_class* Get()
+    {
+        static wxObjcClassInitializer<ObjcType> s_theInstance;
+        s_theInstance.noop(); // Make the compiler think we need this instance
+        return wxObjcCompilerInformation<ObjcType>::GetCompiledClass();
+    }
+private:
+    void noop()
+    {}
+    // This "constructor" operates solely on static data
+    // It exists so that we can take advantage of a function-static
+    // "instance" of this class to do the static data initialization.
+    wxObjcClassInitializer()
+    {
+        // Objective-C class initialization occurs before C++ static initialization because the
+        // libobjc.dylib gets notified directly by dyld on Tiger.
+        // Therefore, even though we change the name, the class is still registered with the
+        // original name.  We unfortunately can't change that.
+
+        // The first time the class is loaded, Objective-C will already have fixed up the super_class
+        // and isa->isa and isa->super_class variables so much of this won't do anything.  But
+        // the next time the class is loaded, Objective-C will ignore it and thus we need to
+        // initialize the data structures appropriately.
+
+        // Ideally we'd have some sort of lock here, but we depend on the fact that we get called
+        // just before the first time someone wants to send a class message so it should be
+        // reasonably safe to do this without any locks.
+
+        struct objc_class &theClassData = *wxObjcCompilerInformation<ObjcType>::GetCompiledClass();
+        // Initialize the uniquified class name
+        UniquifiedName<ObjcType>::Init(sm_theUniquifiedClassName, &theClassData);
+
+        //////// Class Initialization ////////
+        // Use objc_getClass to fix up the superclass pointer
+        theClassData.super_class = wxObjcCompilerInformation<ObjcType>::GetSuperclass();
+        // Fix up the compiler generated class struct to use the new name
+        theClassData.name = sm_theUniquifiedClassName;
+
+        //////// Meta-Class Initialization ////////
+        // theClassData.isa is the metaclass pointer
+        // Globals on Darwin use PC-relative access (slow) so it's quicker to use theClassData.isa
+
+        // In any object hierarchy a metaclass's metaclass is always the root class's metaclass
+        // Therefore, our superclass's metaclass's metaclass should already be the root class's metaclass
+        theClassData.isa->isa = theClassData.super_class->isa->isa;
+        // A metaclass's superclass is always the superclass's metaclass.
+        theClassData.isa->super_class = theClassData.super_class->isa;
+        // Fix up the compiler generated metaclass struct to use the new name
+        theClassData.isa->name = sm_theUniquifiedClassName;
+
+        // We need to set the initialized flag because after we change the name, Objective-C can't
+        // look us up by name because we're only registered with the original name.
+        theClassData.isa->info |= CLS_INITIALIZED;
+    }
+    wxObjcClassInitializer(const wxObjcClassInitializer&); // NO COPY
+    wxObjcClassInitializer& operator =(const wxObjcClassInitializer&); // NO ASSIGN
+    static typename UniquifiedName<ObjcType>::Type sm_theUniquifiedClassName;
+};
+
+template<typename ObjcType>
+typename UniquifiedName<ObjcType>::Type wxObjcClassInitializer<ObjcType>::sm_theUniquifiedClassName;
+
+// WX_DECLARE_GET_OBJC_CLASS
+// Declares a function to get a direct pointer to an objective-C class.
+// The class is guaranteed to be usable.
+// When wxCocoa is built into a Mach-O bundle this function allows the wxCocoa
+// code to get a reference to the Objective-C class structure located in the
+// same bundle.  This allows a static wxCocoa library to be built into
+// two different Mach-O bundles without having one bundle's Objective-C
+// classes trample on the other's.
+// Right now we toss the ObjcSuperClass parameter, but we might use it later.
+#define WX_DECLARE_GET_OBJC_CLASS(ObjcClass,ObjcSuperClass) \
+struct objc_class* wx_GetObjcClass_ ## ObjcClass();
+
+// WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass)
+// Provides an architecture-dependent way to get the direct pointer to the
+// objc_class structure in the __OBJC segment.
+// This takes advantage of the fact that the Objective-C compiler uses guessable
+// local assembler labels for the class structures.
+// Those class structures are only available on the Objective-C file containing the
+// @implementation block.
+
+#if 1
+// Generic implementation - Tested on i386 and PPC.  Should work in all cases.
+// This is a hack that depends on GCC asm symbol names.
+// The static variable winds up being initialized with a direct reference to the appropriate
+// L_OBJC_CLASS and no global symbol reference is generated because nothing uses the global symbol
+// except for the static initializer which does it directly.
+// The generated assembler for s_objc_class_ptr is basically like this:
+// _s_objc_class_ptr_ObjcClass:
+//     .long L_OBJC_CLASS_ObjcClass
+// Once that static symbol is defined, the function implementation is easy for GCC to generate.
+// Do note that return &s_objc_class_data_ObjcClass won't work.  The code is wrong in the case.
+#define WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \
+extern "C" objc_class s_objc_class_data_ ## ObjcClass asm("L_OBJC_CLASS_" #ObjcClass); \
+static objc_class * s_objc_class_ptr_ ## ObjcClass = &s_objc_class_data_ ## ObjcClass; \
+template<> \
+inline objc_class * wxObjcCompilerInformation<ObjcClass>::GetCompiledClass() \
+{ \
+    return s_objc_class_ptr_## ObjcClass; \
+}
+
+#elif defined(__i386__)
+// Not used because the generic implementation seems to work fine.
+// But this is here since it was written beforehand and it also works.
+
+// This is based on the code GCC generates for accessing file-static data on i386.
+// The i386 PC-relative addressing happens in this manner
+// 1. The program counter is placed into ecx using the code that GCC should have
+//    already generated.
+// 2. A label is placed directly after the call to get the program counter.
+// 3. The Load Effective Address instruction is used to add the offset of the
+//    local assembler label we're interested in minus the local assembler label
+//    from step 2 to the program counter register in ecx and place the result
+//    into the result register (typically eax if not inlined).
+#define WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \
+template<> \
+inline objc_class * wxObjcCompilerInformation<ObjcClass>::GetCompiledClass() \
+{ \
+    register struct objc_class *retval; \
+    asm \
+    (   "call ___i686.get_pc_thunk.cx\n" \
+        "\"LPC_FOR_GET_CLASS_" #ObjcClass "\":\n\t" \
+        "leal L_OBJC_CLASS_" #ObjcClass "-\"LPC_FOR_GET_CLASS_" #ObjcClass "\"(%%ecx), %0" \
+    :   "=r"(retval) \
+    :    \
+    :   "ecx" \
+    ); \
+    return retval; \
+}
+
+#elif defined(__ppc__)
+// Not used because the generic implementation seems to work fine.
+// But this is here since it was written beforehand and it also works.
+
+// This is based on the code GCC generates for accessing file-static data on PPC.
+// The PowerPC PC-relative addressing happens in this manner
+// 1. The link register is saved (mflr) to a temporary (we re-use the output register for this)
+// 2. An unconditional branch instruction (bcl) "branches" to the following address (labeled)
+// 3. The link register (filled in by bcl) is saved to r10 (a temporary)
+// 4. The previous link register is restored (mtlr) (from the output register we were using as a temporary)
+// 5. The address of the LPC label as executed is added to the high 16 bits of the offset between that label and the static data we want
+//    and stored in a temporary register (r2)
+// 6. That temporary register plus the low 16 bits of the offset are stored into the result register.
+#define WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \
+template<> \
+inline objc_class * wxObjcCompilerInformation<ObjcClass>::GetCompiledClass() \
+{ \
+    register struct objc_class *retval; \
+    asm \
+    (   "mflr %0" \
+        "\n\tbcl 20, 31, \"LPC_FOR_GET_CLASS_" #ObjcClass "\"" \
+        "\n\"LPC_FOR_GET_CLASS_" #ObjcClass "\":" \
+        "\n\tmflr r10" \
+        "\n\tmtlr %0" \
+        "\n\taddis r2,r10,ha16(L_OBJC_CLASS_" #ObjcClass "-\"LPC_FOR_GET_CLASS_" #ObjcClass "\")" \
+        "\n\tla %0,lo16(L_OBJC_CLASS_" #ObjcClass "-\"LPC_FOR_GET_CLASS_" #ObjcClass "\")(r2)" \
+    :   "=r" (retval) \
+    : \
+    :   "r10","r2" \
+    ); \
+    return retval; \
+}
+
+// TODO: __x86_64__, __ppc64__
+#else // Can't wrie inline asm to bust into __OBJC segment
+// This won't be used since the generic implementation takes precedence.
+
+#warning "Don't know how to implement wxObjcCompilerInformation<ObjcClass>::GetCompiledClass on this platform"
+
+#endif // platforms
+
+// The WX_IMPLEMENT_OBJC_GET_SUPERCLASS macro implements the template specialization
+// to get the superclass.  This only works if it's a real superclass.  If you are
+// deriving from a class that's already being uniquified then you'd need to
+// implement the specialization to call the appropriate get method instead.
+#define WX_IMPLEMENT_OBJC_GET_SUPERCLASS(ObjcClass,ObjcSuperClass) \
+    template <> \
+    inline objc_class* wxObjcCompilerInformation<ObjcClass>::GetSuperclass() \
+    { \
+        return objc_getClass(#ObjcSuperClass); \
+    }
+
+// The WX_IMPLEMENT_OBJC_CLASS_NAME macro implements the template specialization
+// of the sm_theClassName constant.  As soon as this specialization is in place
+// sizeof(sm_theClassName) will return the number of bytes at compile time.
+#define WX_IMPLEMENT_OBJC_CLASS_NAME(ObjcClass) \
+    template <> \
+    const char wxObjcCompilerInformation<ObjcClass>::sm_theClassName[] = #ObjcClass;
+
+// The WX_IMPLEMENT_GET_OBJC_CLASS macro combines all of these together and adds
+// a global wx_GetObjcClass_ObjcClass() function.
+#define WX_IMPLEMENT_GET_OBJC_CLASS(ObjcClass,ObjcSuperClass) \
+    WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \
+    WX_IMPLEMENT_OBJC_GET_SUPERCLASS(ObjcClass,ObjcSuperClass) \
+    WX_IMPLEMENT_OBJC_CLASS_NAME(ObjcClass) \
+    objc_class* wx_GetObjcClass_ ## ObjcClass() \
+    { \
+        return wxObjcClassInitializer<ObjcClass>::Get(); \
+    }
+
+// The WX_GET_OBJC_CLASS macro is intended to wrap the class name when the class
+// is used as a message receiver (e.g. for calling class methods).  When
+// class name uniquifying is used, this calls the global function implemented
+// in the Objective-C file containing the class @implementation.
+#define WX_GET_OBJC_CLASS(ObjcClass) wx_GetObjcClass_ ## ObjcClass()
+
+#else // wxUSE_OBJC_UNIQUIFYING
+
+// Define WX_DECLARE_GET_OBJC_CLASS as nothing
+#define WX_DECLARE_GET_OBJC_CLASS(ObjcClass,ObjcSuperClass)
+// Define WX_IMPLEMENT_GET_OBJC_CLASS as nothing
+#define WX_IMPLEMENT_GET_OBJC_CLASS(ObjcClass,ObjcSuperClass)
+
+// Define WX_GET_OBJC_CLASS macro to output the class name and let the compiler do the normal thing
+// The WX_GET_OBJC_CLASS macro is intended to wrap the class name when the class
+// is used as a message receiver (e.g. for calling class methods).  When
+// class name uniquifying is not used, this is simply defined to be the class
+// name which will allow the compiler to do the normal thing.
+#define WX_GET_OBJC_CLASS(ObjcClass) ObjcClass
+
+#endif // wxUSE_OBJC_UNIQUIFYING
+
+#endif //ndef __WX_COCOA_OBJC_CLASS_H__

include/wx/cocoa/pen.h

@@ -61,7 +61,7 @@ public:
     wxBitmap *GetStipple() const;
 
     WX_NSColor GetNSColor();
-    int GetCocoaLineDash(const float **pattern);
+    int GetCocoaLineDash(const CGFloat **pattern);
 };
 
 #endif // __WX_COCOA_PEN_H__

include/wx/cocoa/radiobox.h

@@ -13,6 +13,7 @@
 #define __WX_COCOA_RADIOBOX_H__
 
 // #include "wx/cocoa/NSButton.h"
+DECLARE_WXCOCOA_OBJC_CLASS(NSMatrix);
 
 // ========================================================================
 // wxRadioBox
@@ -21,7 +22,9 @@ class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase// , protec
 {
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
     DECLARE_EVENT_TABLE()
-//    WX_DECLARE_COCOA_OWNER(NSButton,NSControl,NSView)
+    // NOTE: We explicitly skip NSControl because our primary cocoa view is
+    // the NSBox but we want to receive action messages from the NSMatrix.
+    WX_DECLARE_COCOA_OWNER(NSBox,NSView,NSView)
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
@@ -92,6 +95,7 @@ public:
 protected:
     // Static boxes cannot be enabled/disabled
     virtual void CocoaSetEnabled(bool enable) { }
+    virtual void CocoaTarget_action(void);
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
@@ -106,7 +110,29 @@ public:
     virtual void SetString(unsigned int n, const wxString& label);
     // change the individual radio button state
 protected:
+    // We don't want the typical wxCocoaNSBox behavior because our real
+    // implementation is by using an NSMatrix as the NSBox's contentView.
+    WX_NSMatrix GetNSMatrix() const;
+    void AssociateNSBox(WX_NSBox theBox);
+    void DisassociateNSBox(WX_NSBox theBox);
+
     virtual wxSize DoGetBestSize() const;
+
+    int GetRowForIndex(int n) const
+    {
+        if(m_windowStyle & wxRA_SPECIFY_COLS)
+            return n / GetMajorDim();
+        else
+            return n % GetMajorDim();
+    }
+
+    int GetColumnForIndex(int n) const
+    {
+        if(m_windowStyle & wxRA_SPECIFY_COLS)
+            return n % GetMajorDim();
+        else
+            return n / GetMajorDim();
+    }
 };
 
 #endif // __WX_COCOA_RADIOBOX_H__

include/wx/cocoa/radiobut.h

@@ -56,6 +56,8 @@ public:
 // ------------------------------------------------------------------------
 protected:
     virtual void Cocoa_wxNSButtonAction(void);
+private:
+    void Cocoa_DeselectOtherButtonsInTheGroup(void);
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------

include/wx/cocoa/region.h

@@ -14,7 +14,11 @@
 
 #include "wx/generic/region.h"
 
+#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
+typedef struct CGRect NSRect;
+#else
 typedef struct _NSRect NSRect;
+#endif
 
 class WXDLLEXPORT wxRegion : public wxRegionGeneric
 {

include/wx/cocoa/statbox.h

@@ -41,6 +41,9 @@ public:
             long style = 0, const wxString& name = wxStaticBoxNameStr);
     virtual ~wxStaticBox();
 
+    virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel() const;
+
 // ------------------------------------------------------------------------
 // Cocoa callbacks
 // ------------------------------------------------------------------------

include/wx/cocoa/stattext.h

@@ -52,8 +52,8 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
-    void SetLabel(const wxString& label);
+    virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel() const;
 };
 
-#endif
+#endif // __WX_COCOA_STATTEXT_H__
-    // __WX_COCOA_STATTEXT_H__

include/wx/cocoa/toolbar.h

@@ -17,7 +17,12 @@
 // ========================================================================
 // wxToolBar
 // ========================================================================
+#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
+typedef struct CGPoint NSPoint;
+#else
 typedef struct _NSPoint NSPoint;
+#endif
+
 class wxToolBarTool;
 
 class wxToolBar : public wxToolBarBase

include/wx/cocoa/toplevel.h

@@ -106,6 +106,8 @@ public:
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;
 
+    // Default button (item)
+    wxWindow *SetDefaultItem(wxWindow *win);
 
 // Things I may/may not do
 //    virtual void SetIcon(const wxIcon& icon);

include/wx/cocoa/trackingrectmanager.h

@@ -0,0 +1,38 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/cocoa/trackingrectmanager.h
+// Purpose:     wxCocoaTrackingRectManager
+// Notes:       Source in window.mm
+// Author:      David Elliott <dfe@cox.net>
+// Modified by:
+// Created:     2007/05/02
+// RCS-ID:      $Id$
+// Copyright:   (c) 2007 Software 2000 Ltd.
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+#ifndef __WX_COCOA_TRACKINGRECTMANAGER_H__
+#define __WX_COCOA_TRACKINGRECTMANAGER_H__
+
+#include <CoreFoundation/CFRunLoop.h>
+
+class wxCocoaTrackingRectManager
+{
+    DECLARE_NO_COPY_CLASS(wxCocoaTrackingRectManager)
+public:
+    wxCocoaTrackingRectManager(wxWindow *window);
+    void ClearTrackingRect();
+    void BuildTrackingRect();
+    void RebuildTrackingRect();
+    bool IsOwnerOfEvent(NSEvent *anEvent);
+    ~wxCocoaTrackingRectManager();
+    void BeginSynthesizingEvents();
+    void StopSynthesizingEvents();
+protected:
+    wxWindow *m_window;
+    bool m_isTrackingRectActive;
+    int m_trackingRectTag;
+    CFRunLoopObserverRef m_runLoopObserver;
+private:
+    wxCocoaTrackingRectManager();
+};
+
+#endif // ndef __WX_COCOA_TRACKINGRECTMANAGER_H__

include/wx/cocoa/window.h

@@ -22,6 +22,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSAffineTransform);
 
 class wxWindowCocoaHider;
 class wxWindowCocoaScrollView;
+class wxCocoaTrackingRectManager;
 
 // ========================================================================
 // wxWindowCocoa
@@ -33,6 +34,7 @@ class WXDLLEXPORT wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView
     DECLARE_EVENT_TABLE()
     friend wxWindow *wxWindowBase::GetCapture();
     friend class wxWindowCocoaScrollView;
+    friend class wxCocoaTrackingRectManager;
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
@@ -93,6 +95,11 @@ protected:
     void InitMouseEvent(wxMouseEvent &event, WX_NSEvent cocoaEvent);
     virtual wxWindow* GetWxWindow() const;
     virtual void Cocoa_FrameChanged(void);
+#if 0 // ABI incompatibility
+    virtual void Cocoa_synthesizeMouseMoved(void);
+#else
+    void Cocoa_synthesizeMouseMoved(void);
+#endif
     virtual bool Cocoa_drawRect(const NSRect &rect);
     virtual bool Cocoa_mouseDown(WX_NSEvent theEvent);
     virtual bool Cocoa_mouseDragged(WX_NSEvent theEvent);
@@ -107,11 +114,18 @@ protected:
     virtual bool Cocoa_otherMouseDragged(WX_NSEvent theEvent);
     virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent);
     virtual bool Cocoa_resetCursorRects();
+#if 0 // ABI incompatibility
+    virtual bool Cocoa_viewDidMoveToWindow();
+    virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow newWindow);
+#endif
     void SetNSView(WX_NSView cocoaNSView);
     WX_NSView m_cocoaNSView;
     wxWindowCocoaHider *m_cocoaHider;
     wxWindowCocoaScrollView *m_wxCocoaScrollView;
     bool m_isInPaint;
+#if 0 // ABI incompatibility
+    wxCocoaTrackingRectManager *m_visibleTrackingRectManager;
+#endif
     static wxWindow *sm_capturedWindow;
     virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView);
     void SetInitialFrameRect(const wxPoint& pos, const wxSize& size);
@@ -141,6 +155,8 @@ public:
     virtual void SetFocus();
     // Warp the pointer the given position
     virtual void WarpPointer(int x_pos, int y_pos) ;
+    // Change the window's cursor
+    virtual bool SetCursor( const wxCursor &cursor );
     // Send the window a refresh event
     virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
     // Set/get the window's font

include/wx/datetime.h

@@ -1678,7 +1678,7 @@ inline time_t wxDateTime::GetTicks() const
         return (time_t)-1;
     }
 
-    return (time_t)((m_time / (long)TIME_T_FACTOR).GetLo())+WX_TIME_BASE_OFFSET ;
+    return (time_t)((m_time / (long)TIME_T_FACTOR).ToLong()) + WX_TIME_BASE_OFFSET;
 }
 
 inline bool wxDateTime::SetToLastWeekDay(WeekDay weekday,

include/wx/defs.h

@@ -1035,11 +1035,7 @@ typedef float wxFloat32;
     typedef double wxFloat64;
 #endif
 
-#if defined( __WXMAC__ )  && !defined( __POWERPC__ )
+typedef double wxDouble;
-    typedef long double wxDouble;
-#else
-    typedef double wxDouble;
-#endif
 
 /*
     Some (non standard) compilers typedef wchar_t as an existing type instead
@@ -1299,7 +1295,8 @@ enum wxBorder
     wxBORDER_SIMPLE = 0x02000000,
     wxBORDER_RAISED = 0x04000000,
     wxBORDER_SUNKEN = 0x08000000,
-    wxBORDER_DOUBLE = 0x10000000,
+    wxBORDER_DOUBLE = 0x10000000, /* deprecated */
+    wxBORDER_THEME =  0x10000000,
 
     /*  a mask to extract border style from the combination of flags */
     wxBORDER_MASK   = 0x1f200000
@@ -2419,6 +2416,36 @@ typedef void*       WXDisplay;
 
 #ifdef __WXCOCOA__
 
+/* Definitions of 32-bit/64-bit types
+ * These are typedef'd exactly the same way in newer OS X headers so
+ * redefinition when real headers are included should not be a problem.  If
+ * it is, the types are being defined wrongly here.
+ * The purpose of these types is so they can be used from public wx headers.
+ * and also because the older (pre-Leopard) headers don't define them.
+ */
+
+/* NOTE: We don't pollute namespace with CGFLOAT_MIN/MAX/IS_DOUBLE macros
+ * since they are unlikely to be needed in a public header.
+ */
+#if defined(__LP64__) && __LP64__
+	typedef double CGFloat;
+#else
+	typedef float CGFloat;
+#endif
+
+#if (defined(__LP64__) && __LP64__) || (defined(NS_BUILD_32_LIKE_64) && NS_BUILD_32_LIKE_64)
+typedef long NSInteger;
+typedef unsigned long NSUInteger;
+#else
+typedef int NSInteger;
+typedef unsigned int NSUInteger;
+#endif
+
+/* Objective-C type declarations.
+ * These are to be used in public headers in lieu of NSSomething* because
+ * Objective-C class names are not available in C/C++ code.
+ */
+
 /*  NOTE: This ought to work with other compilers too, but I'm being cautious */
 #if (defined(__GNUC__) && defined(__APPLE__)) || defined(__MWERKS__)
 /* It's desirable to have type safety for Objective-C(++) code as it does

include/wx/docview.h

@@ -141,8 +141,22 @@ public:
     virtual void SetDocumentTemplate(wxDocTemplate *temp) { m_documentTemplate = temp; }
 
     // Get title, or filename if no title, else [unnamed]
+    //
+    // NB: this method will be deprecated in wxWidgets 3.0, you still need to
+    //     override it if you need to modify the existing behaviour in this
+    //     version but use GetUserReadableName() below if you just need to call
+    //     it
     virtual bool GetPrintableName(wxString& buf) const;
 
+#if wxABI_VERSION >= 20805
+    wxString GetUserReadableName() const
+    {
+        wxString s;
+        GetPrintableName(s);
+        return s;
+    }
+#endif // wxABI 2.8.5+
+
     // Returns a window that can be used as a parent for document-related
     // dialogs. Override if necessary.
     virtual wxWindow *GetDocumentWindow() const;

include/wx/file.h

@@ -100,6 +100,8 @@ public:
   bool Write(const wxString& s, const wxMBConv& conv = wxConvUTF8)
   {
       const wxWX2MBbuf buf = s.mb_str(conv);
+      if (!buf)
+          return false;
       size_t size = strlen(buf);
       return Write((const char *) buf, size) == size;
   }

include/wx/fs_mem.h

@@ -35,6 +35,14 @@ public:
     // name "memory:" + filename
     static void AddFile(const wxString& filename, const wxString& textdata);
     static void AddFile(const wxString& filename, const void *binarydata, size_t size);
+#if wxABI_VERSION >= 20805
+    static void AddFileWithMimeType(const wxString& filename,
+                                    const wxString& textdata,
+                                    const wxString& mimetype);
+    static void AddFileWithMimeType(const wxString& filename,
+                                    const void *binarydata, size_t size,
+                                    const wxString& mimetype);
+#endif // wxABI_VERSION >= 20805
 
     // Remove file from memory FS and free occupied memory
     static void RemoveFile(const wxString& filename);
@@ -73,6 +81,24 @@ public:
     {
         wxMemoryFSHandlerBase::AddFile(filename, binarydata, size);
     }
+#if wxABI_VERSION >= 20805
+    static void AddFileWithMimeType(const wxString& filename,
+                                    const wxString& textdata,
+                                    const wxString& mimetype)
+    {
+        wxMemoryFSHandlerBase::AddFileWithMimeType(filename,
+                                                   textdata,
+                                                   mimetype);
+    }
+    static void AddFileWithMimeType(const wxString& filename,
+                                    const void *binarydata, size_t size,
+                                    const wxString& mimetype)
+    {
+        wxMemoryFSHandlerBase::AddFileWithMimeType(filename,
+                                                   binarydata, size,
+                                                   mimetype);
+    }
+#endif // wxABI_VERSION >= 20805
 
 #if wxUSE_IMAGE
     static void AddFile(const wxString& filename,

include/wx/generic/listctrl.h

@@ -252,7 +252,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericListCtrl)
 };
 
-#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && !defined(__WXMAC__)
+#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && (!defined(__WXMAC__) || defined(__WXUNIVERSAL__))
 /*
  * wxListCtrl has to be a real class or we have problems with
  * the run-time information.

include/wx/generic/wizard.h

@@ -58,6 +58,12 @@ public:
     virtual wxSizer *GetPageAreaSizer() const;
     virtual void SetBorder(int border);
 
+    /// set/get bitmap
+#if wxABI_VERSION >= 20805
+    const wxBitmap& GetBitmap() const { return m_bitmap; }
+    void SetBitmap(const wxBitmap& bitmap);
+#endif
+
     // implementation only from now on
     // -------------------------------
 

include/wx/gtk/filepicker.h

@@ -36,7 +36,8 @@
                                                                               \
     virtual bool Destroy()                                                    \
     {                                                                         \
-        m_dialog->Destroy();                                                  \
+        if (m_dialog)                                                         \
+            m_dialog->Destroy();                                              \
         return wxButton::Destroy();                                           \
     }                                                                         \
                                                                               \

include/wx/gtk/glcanvas.h

@@ -25,15 +25,14 @@ extern "C" {
 // classes
 //---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGLContext;
+class WXDLLIMPEXP_GL wxGLCanvas;
-class WXDLLEXPORT wxGLCanvas;
 
 //---------------------------------------------------------------------------
 // wxGLContext
 //---------------------------------------------------------------------------
 
 
-class WXDLLEXPORT wxGLContext: public wxObject
+class WXDLLIMPEXP_GL wxGLContext: public wxObject
 {
 public:
     wxGLContext(wxWindow* win, const wxGLContext* other=NULL /* for sharing display lists */);
@@ -55,7 +54,7 @@ private:
 // wxGLCanvas
 //---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGLCanvas: public wxWindow
+class WXDLLIMPEXP_GL wxGLCanvas: public wxWindow
 {
 public:
     // This ctor is identical to the next, except for the fact that it

include/wx/gtk/gnome/gprint.h

@@ -179,10 +179,7 @@ public:
     virtual wxDC* PrintDialog(wxWindow *parent);
     virtual bool Setup(wxWindow *parent);
 
-    GnomePrintContext *GetPrintContext() { return m_gpc; }
-
 private:
-    GnomePrintContext *m_gpc;
     bool               m_native_preview;
 
 private:
@@ -197,7 +194,6 @@ private:
 class wxGnomePrintDC: public wxDC
 {
 public:
-    wxGnomePrintDC( wxGnomePrinter *printer );
     wxGnomePrintDC( const wxPrintData& data );
     virtual ~wxGnomePrintDC();
 
@@ -262,8 +258,8 @@ protected:
     void DoGetSize(int* width, int* height) const;
     void DoGetSizeMM(int *width, int *height) const;
 
+    void SetPrintData(const wxPrintData& data);
     wxPrintData& GetPrintData() { return m_printData; }
-    void SetPrintData(const wxPrintData& data) { m_printData = data; }
 
 private:
     static float ms_PSScaleFactor;
@@ -280,7 +276,6 @@ private:
     
     int                     m_deviceOffsetY;
 
-    wxGnomePrinter         *m_printer;
     GnomePrintContext      *m_gpc;
     GnomePrintJob*          m_job; // only used and destroyed when created with wxPrintData
 

include/wx/gtk/private.h

@@ -33,7 +33,7 @@
     #include "wx/font.h"
 
     // convert the text in given encoding to UTF-8 used by wxGTK
-    extern wxCharBuffer
+    WXDLLIMPEXP_CORE extern wxCharBuffer
     wxConvertToGTK(const wxString& s,
                    wxFontEncoding enc = wxFONTENCODING_SYSTEM);
 

include/wx/html/htmprint.h

@@ -256,6 +256,13 @@ public:
             // return page setting data objects.
             // (You can set their parameters.)
 
+#if wxABI_VERSION >= 20805
+    wxWindow* GetParentWindow() const { return m_ParentWindow; }
+            // get the parent window
+    void SetParentWindow(wxWindow* window) { m_ParentWindow = window; }
+            // set the parent window
+#endif
+
 protected:
     virtual wxHtmlPrintout *CreatePrintout();
     virtual bool DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2);

include/wx/listbase.h

@@ -336,7 +336,7 @@ protected:
         m_col = 0;
         m_state = 0;
         m_stateMask = 0;
-        m_image = 0;
+        m_image = -1;
         m_data = 0;
 
         m_format = wxLIST_FORMAT_CENTRE;

include/wx/listctrl.h

@@ -30,7 +30,7 @@ extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
     #include "wx/mac/carbon/listctrl.h"
 #else
     #include "wx/generic/listctrl.h"

include/wx/log.h

@@ -176,9 +176,14 @@ public:
     // Set log level.  Log messages with level > logLevel will not be logged.
     static void SetLogLevel(wxLogLevel logLevel) { ms_logLevel = logLevel; }
 
+#if wxABI_VERSION >= 20805 /* 2.8.5+ only */
     // should GetActiveTarget() try to create a new log object if the
     // current is NULL?
     static void DontCreateOnDemand();
+#endif
+
+    // Make GetActiveTarget() create a new log object again.
+    static void DoCreateOnDemand();
 
     // log the count of repeating messages instead of logging the messages
     // multiple times
@@ -415,6 +420,11 @@ public:
     // override base class version to flush the old logger as well
     virtual void Flush();
 
+    // call to avoid destroying the old log target
+#if wxABI_VERSION >= 20805 /* 2.8.5+ only */
+    void DetachOldLog() { m_logOld = NULL; }
+#endif
+
 protected:
     // pass the chain to the old logger if needed
     virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t);

include/wx/mac/carbon/app.h

@@ -78,6 +78,7 @@ public:
     // adding a CFType object to be released only at the end of the current event cycle (increases the
     // refcount of the object passed), needed in case we are in the middle of an event concering an object
     // we want to delete and cannot do it immediately
+    // TODO change semantics to be in line with cocoa (make autrelease NOT increase the count)
     void                  MacAddToAutorelease( void* cfrefobj );
 public:
     static wxWindow*      s_captureWindow ;

include/wx/mac/carbon/dataform.h

@@ -19,9 +19,11 @@ public:
 
     wxDataFormat();
     wxDataFormat(wxDataFormatId vType);
+    wxDataFormat(const wxDataFormat& rFormat);
     wxDataFormat(const wxString& rId);
     wxDataFormat(const wxChar* pId);
     wxDataFormat(NativeFormat vFormat);
+    ~wxDataFormat();
 
     wxDataFormat& operator=(NativeFormat vFormat)
         { SetId(vFormat); return *this; }
@@ -35,6 +37,8 @@ public:
     bool operator!=(wxDataFormatId format) const
         { return m_type != (wxDataFormatId)format; }
 
+    wxDataFormat& operator=(const wxDataFormat& format);
+
     // explicit and implicit conversions to NativeFormat which is one of
     // standard data types (implicit conversion is useful for preserving the
     // compatibility with old code)

include/wx/mac/carbon/dataobj.h

@@ -25,6 +25,12 @@ public:
 #endif
 
     virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
+    void AddToPasteboard( void * pasteboardRef , int itemID );
+    // returns true if the passed in format is present in the pasteboard
+    static bool IsFormatInPasteboard( void * pasteboardRef, const wxDataFormat &dataFormat );
+    // returns true if any of the accepted formats of this dataobj is in the pasteboard
+    bool HasDataInPasteboard( void * pasteboardRef );
+    bool GetFromPasteboard( void * pasteboardRef );
 };
 
 #endif // _WX_MAC_DATAOBJ_H_

include/wx/mac/carbon/font.h

@@ -51,7 +51,10 @@ public:
     bool Create(const wxNativeFontInfo& info);
 
     bool MacCreateThemeFont( wxUint16 themeFontID ) ;
-    
+#ifdef __LP64__
+	bool MacCreateUIFont( wxUint32 coreTextFontType );
+#endif
+
     virtual ~wxFont();
 
     // implement base class pure virtuals
@@ -84,19 +87,24 @@ public:
 
     // Mac-specific, risks to change, don't use in portable code
     
+#ifndef __LP64__    
     // 'old' Quickdraw accessors
-    
     short MacGetFontNum() const;
     short MacGetFontSize() const;
     wxByte  MacGetFontStyle() const;
-    
+
     // 'new' ATSUI accessors
-    
     wxUint32 MacGetATSUFontID() const;
     wxUint32 MacGetATSUAdditionalQDStyles() const;
     wxUint16 MacGetThemeFontID() const ;
+
     // Returns an ATSUStyle not ATSUStyle*
     void* MacGetATSUStyle() const ; 
+#else
+    const void * MacGetCTFont() const;
+    // soon to be removed for 64bit, Returns an ATSUStyle not ATSUStyle*
+    void* MacGetATSUStyle() const ; 
+#endif
     
 protected:
     void Unshare();

include/wx/mac/carbon/menuitem.h

@@ -47,6 +47,8 @@ public:
     void UpdateItemBitmap() ;
     void UpdateItemText() ;
     void UpdateItemStatus() ;
+    
+    void DoUpdateItemBitmap( WXHMENU menu, wxUint16 index) ;
 
     // mark item as belonging to the given radio group
     void SetAsRadioGroupStart();

include/wx/mac/carbon/popupwin.h

@@ -20,6 +20,7 @@ class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
 {
 public:
     wxPopupWindow() { }
+    ~wxPopupWindow();
 
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
         { (void)Create(parent, flags); }
@@ -28,9 +29,16 @@ public:
 
     virtual bool Show(bool show = true);
 
+    WXWindow MacGetPopupWindowRef() const ;
+
 protected:
     // popups handle the position like wxTopLevelWindow, not wxWindow
     virtual void DoGetPosition(int *x, int *y) const;
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual void DoGetClientSize( int *width, int *height ) const;
+    
+    WXWindow m_popupWindowRef ;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
 };

include/wx/mac/carbon/private.h

@@ -49,6 +49,7 @@
 
 #ifdef __WXMAC_CARBON__
 #include "wx/mac/corefoundation/cfstring.h"
+#include "wx/mac/corefoundation/cfdataref.h"
 #endif
 
 #ifndef FixedToInt
@@ -429,6 +430,11 @@ public :
 
     operator refType () const { return m_ref; }
 
+    wxMacCFRefHolder& operator=(refType r)
+    {
+        Set( r );
+        return *this;
+    }
 private :
     refType m_ref;
     bool m_release;
@@ -473,7 +479,7 @@ void wxMacNativeToRect( const Rect *n , wxRect* wx );
 void wxMacPointToNative( const wxPoint* wx , Point *n );
 void wxMacNativeToPoint( const Point *n , wxPoint* wx );
 
-wxWindow *              wxFindControlFromMacControl(ControlRef inControl );
+wxWindowMac *           wxFindControlFromMacControl(ControlRef inControl );
 wxTopLevelWindowMac*    wxFindWinFromMacWindow( WindowRef inWindow );
 wxMenu*                 wxFindMenuFromMacMenu(MenuRef inMenuRef);
 
@@ -483,7 +489,7 @@ wxMenu*                 wxFindMenuFromMacCommand( const HICommand &macCommandId
 
 extern wxWindow* g_MacLastWindow;
 pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data );
-Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true );
+Rect wxMacGetBoundsForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true );
 
 ControlActionUPP GetwxMacLiveScrollbarActionProc();
 
@@ -1227,9 +1233,13 @@ public:
 
     // returns a Pict from the bitmap content
     PicHandle     GetPictHandle();
+#if wxMAC_USE_CORE_GRAPHICS
+    CGContextRef  GetBitmapContext() const;
+#else
     GWorldPtr     GetHBITMAP(GWorldPtr * mask = NULL ) const;
     void          UpdateAlphaMask() const;
-
+#endif
+    int           GetBytesPerRow() const { return m_bytesPerRow; }
 private :
     bool Create(int width , int height , int depth);
     void Init();
@@ -1247,10 +1257,14 @@ private :
 #endif
     IconRef       m_iconRef;
     PicHandle     m_pictHandle;
+#if wxMAC_USE_CORE_GRAPHICS
+    CGContextRef  m_hBitmap;
+#else
     GWorldPtr     m_hBitmap;
     GWorldPtr     m_hMaskBitmap;
     wxMemoryBuffer m_maskMemBuf;
     int            m_maskBytesPerRow;
+#endif
 };
 
 class WXDLLEXPORT wxIconRefData : public wxGDIRefData
@@ -1278,6 +1292,16 @@ private :
 
 // toplevel.cpp
 
+class wxMacDeferredWindowDeleter : public wxObject
+{
+public :
+    wxMacDeferredWindowDeleter( WindowRef windowRef );
+    virtual ~wxMacDeferredWindowDeleter();
+
+protected :
+    WindowRef m_macWindow ;
+} ;
+
 ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, const Point& location , WindowRef window , ControlPartCode *outPart );
 
 #ifndef __LP64__
@@ -1333,5 +1357,20 @@ void wxMacGlobalToLocal( WindowRef window , Point*pt );
 
 #endif
 
+//---------------------------------------------------------------------------
+// cocoa bridging utilities
+//---------------------------------------------------------------------------
+
+bool wxMacInitCocoa();
+
+class wxMacAutoreleasePool
+{
+public :
+    wxMacAutoreleasePool();
+    ~wxMacAutoreleasePool();
+private :
+    void* m_pool;
+};
+
 #endif
     // _WX_PRIVATE_H_

include/wx/mac/carbon/private/mactext.h

@@ -102,10 +102,6 @@ protected :
 
     // contains the tag for the content (is different for password and non-password controls)
     OSType m_valueTag ;
-
-    // as the selection tag only works correctly when the control has the focus we have to mirror the
-    // intended value
-    EventHandlerRef m_focusHandlerRef ;
 public :
     ControlEditTextSelectionRec m_selection ;
 };

include/wx/mac/carbon/textctrl.h

@@ -18,6 +18,9 @@
     // has more features (backgrounds etc.), but may show redraw artefacts and other
     // problems depending on your usage; hence, the default is 'false'.
     #define wxMAC_TEXTCONTROL_USE_MLTE wxT("mac.textcontrol-use-mlte")
+    // set this to 'true' if you want editable text controls to have spell checking turned
+    // on by default, you can change this setting individually on a control using MacCheckSpelling
+    #define wxMAC_TEXTCONTROL_USE_SPELL_CHECKER wxT("mac.textcontrol-use-spell-checker")
 #endif
 
 #include "wx/control.h"

include/wx/mac/carbon/toplevel.h

@@ -61,7 +61,9 @@ public:
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
     virtual void SetIcon(const wxIcon& icon);
+#ifndef __WXUNIVERSAL__
     virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }
+#endif
     virtual void Restore();
 
     virtual bool SetShape(const wxRegion& region);
@@ -118,6 +120,7 @@ protected:
     virtual void DoGetSize( int *width, int *height ) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoGetClientSize(int *width, int *height) const;
+    virtual void DoCentre(int dir);
 
     // is the frame currently iconized?
     bool m_iconized;

include/wx/mac/carbon/uma.h

@@ -102,12 +102,13 @@ OSStatus UMAGetHelpMenu(
 
 OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;
 
-// Clipboard support
-
-OSStatus UMAPutScrap( Size size , OSType type , void *data ) ;
-
 #define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn )
 
+// Quartz 
+
+CGDataProviderRef UMACGDataProviderCreateWithCFData( CFDataRef data );
+CGDataConsumerRef UMACGDataConsumerCreateWithCFData( CFMutableDataRef data );
+
 #endif // wxUSE_GUI
 
 #endif

include/wx/mac/carbon/window.h

@@ -310,6 +310,7 @@ protected:
 
     virtual bool        MacIsChildOfClientArea( const wxWindow* child ) const ;
 
+    bool                MacHasScrollBarCorner() const;
     void                MacCreateScrollBars( long style ) ;
     void                MacRepositionScrollBars() ;
     void                MacUpdateControlFont() ;

include/wx/mac/corefoundation/cfdataref.h

@@ -0,0 +1,97 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/mac/corefoundation/cfdata.h
+// Purpose:     wxCFDataRef class
+// Author:      Stefan Csomor
+// Modified by: 
+// Created:     2007/05/10
+// RCS-ID:      $Id$
+// Copyright:   (c) 2007 Stefan Csomor
+// Licence:     wxWindows licence
+// Notes:       See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBinaryData/index.html
+/////////////////////////////////////////////////////////////////////////////
+/*! @header     wx/mac/corefoundation/cfref.h
+    @abstract   wxCFDataRef template class
+*/
+
+#ifndef _WX_MAC_COREFOUNDATION_CFDATAREF_H__
+#define _WX_MAC_COREFOUNDATION_CFDATAREF_H__
+
+#include "wx/mac/corefoundation/cfref.h"
+
+#include <CoreFoundation/CFData.h>
+
+/*! @class wxCFDataRef
+    @discussion Properly retains/releases reference to CoreFoundation data objects
+*/
+class wxCFDataRef : public wxCFRef< CFDataRef >
+{
+public:
+    /*! @method     wxCFDataRef
+        @abstract   Creates a NULL data ref
+    */
+    wxCFDataRef()
+    {}
+
+    typedef wxCFRef<CFDataRef> super_type;
+    
+    /*! @method     wxCFDataRef
+        @abstract   Assumes ownership of p and creates a reference to it.
+        @templatefield otherType    Any type.
+        @param p        The raw pointer to assume ownership of.  May be NULL.
+        @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends
+                    to transfer ownership of that reference to this ref holder.  If the object comes from
+                    a Create or Copy method then this is the correct behavior.  If the object comes from
+                    a Get method then you must CFRetain it yourself before passing it to this constructor.
+                    A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
+                    This method is templated and takes an otherType *p.  This prevents implicit conversion
+                    using an operator refType() in a different ref-holding class type.
+    */
+    explicit wxCFDataRef(CFDataRef r)
+    :   super_type(r)
+    {}
+
+    /*! @method     wxCFDataRef
+        @abstract   Copies a ref holder of the same type
+        @param otherRef The other ref holder to copy.
+        @discussion Ownership will be shared by the original ref and the newly created ref. That is,
+                    the object will be explicitly retained by this new ref.
+    */
+    wxCFDataRef(const wxCFDataRef& otherRef)
+    :  super_type( otherRef )
+    {}
+
+    /*! @method     wxCFDataRef
+        @abstract   Copies raw data into a data ref
+        @param data The raw data.
+        @param length The data length.
+    */
+    wxCFDataRef(const UInt8* data, CFIndex length) 
+    : super_type(CFDataCreate(kCFAllocatorDefault, data, length))
+    {
+    }
+
+    /*! @method     GetLength
+        @abstract   returns the length in bytes of the data stored
+    */
+    CFIndex GetLength() const
+    {
+        if ( m_ptr )
+            return CFDataGetLength( *this );
+        else
+            return 0;
+    }
+    
+    /*! @method     GetBytes
+        @abstract   Copies the data into an external buffer
+        @param range The desired range.
+        @param buffer The target buffer.
+    */
+    void GetBytes( CFRange range, UInt8 *buffer ) const
+    {
+        if ( m_ptr )
+            CFDataGetBytes(m_ptr, range, buffer);
+    }
+};
+
+#endif //ifndef _WX_MAC_COREFOUNDATION_CFDATAREF_H__
+

include/wx/mac/corefoundation/cfref.h

@@ -0,0 +1,384 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/mac/corefoundation/cfref.h
+// Purpose:     wxCFRef template class
+// Author:      David Elliott <dfe@cox.net>
+// Modified by: Stefan Csomor
+// Created:     2007/05/10
+// RCS-ID:      $Id$
+// Copyright:   (c) 2007 David Elliott <dfe@cox.net>, Stefan Csomor
+// Licence:     wxWindows licence
+// Notes:       See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFMemoryMgmt/index.html
+/////////////////////////////////////////////////////////////////////////////
+/*! @header     wx/mac/corefoundation/cfref.h
+    @abstract   wxCFRef template class
+    @discussion FIXME: Convert doc tags to something less buggy with C++
+*/
+
+#ifndef _WX_MAC_COREFOUNDATION_CFREF_H__
+#define _WX_MAC_COREFOUNDATION_CFREF_H__
+
+// #include <CoreFoundation/CFBase.h>
+/* Don't include CFBase.h such that this header can be included from public
+ * headers with minimal namespace pollution.
+ * Note that Darwin CF uses extern for CF_EXPORT.  If we need this on Win32
+ * or non-Darwin Mac OS we'll need to define the appropriate __declspec.
+ */
+extern "C" {
+typedef const void *CFTypeRef;
+extern /* CF_EXPORT */
+CFTypeRef CFRetain(CFTypeRef cf);
+extern /* CF_EXPORT */
+void CFRelease(CFTypeRef cf);
+} // extern "C"
+
+
+/*! @function   wxCFRelease
+    @abstract   A CFRelease variant that checks for NULL before releasing.
+    @discussion The parameter is template not for type safety but to ensure the argument
+                is a raw pointer and not a ref holder of any type.
+*/
+template <class Type>
+inline void wxCFRelease(Type *r)
+{
+    if ( r != NULL )
+        ::CFRelease((CFTypeRef)r);
+}
+
+/*! @function   wxCFRetain
+    @abstract   A typesafe CFRetain variant that checks for NULL.
+*/
+template <class Type>
+inline Type* wxCFRetain(Type *r)
+{
+    // NOTE(DE): Setting r to the result of CFRetain improves efficiency on both x86 and PPC
+    // Casting r to CFTypeRef ensures we are calling the real C version defined in CFBase.h
+    // and not any possibly templated/overloaded CFRetain.
+    if ( r != NULL )
+        r = (Type*)::CFRetain((CFTypeRef)r);
+    return r;
+}
+
+template <class refType>
+class wxCFRef;
+
+/*! @class wxCFWeakRef
+    @templatefield  refType     The CF reference type (e.g. CFStringRef, CFRunLoopRef, etc.)
+                                It should already be a pointer.  This is different from
+                                shared_ptr where the template parameter is the pointee type.
+    @discussion Wraps a raw pointer without any retain or release.
+                Provides a way to get what amounts to a raw pointer from a wxCFRef without
+                using a raw pointer.  Unlike a raw pointer, constructing a wxCFRef from this
+                class will cause it to be retained because it is assumed that a wxCFWeakRef
+                does not own its pointer.
+*/
+template <class refType>
+class wxCFWeakRef
+{
+    template <class refTypeA, class otherRefType>
+    friend wxCFWeakRef<refTypeA> static_cfref_cast(const wxCFRef<otherRefType> &otherRef);
+public:
+    /*! @method     wxCFWeakRef
+        @abstract   Creates a NULL reference
+    */
+    wxCFWeakRef()
+    :   m_ptr(NULL)
+    {}
+
+    // Default copy constructor is fine.
+    // Default destructor is fine but we'll set NULL to avoid bugs
+    ~wxCFWeakRef()
+    {   m_ptr = NULL; }
+
+    // Do not implement a raw-pointer constructor.
+
+    /*! @method     wxCFWeakRef
+        @abstract   Copies another ref holder where its type can be converted to ours
+        @templatefield otherRefType     Any type held by another wxCFWeakRef.
+        @param otherRef The other weak ref holder to copy.
+        @discussion This is merely a copy or implicit cast.
+    */
+    template <class otherRefType>
+    wxCFWeakRef(const wxCFWeakRef<otherRefType>& otherRef)
+    :   m_ptr(otherRef.get()) // Implicit conversion from otherRefType to refType should occur
+    {}
+
+    /*! @method     wxCFWeakRef
+        @abstract   Copies a strong ref holder where its type can be converted to ours
+        @templatefield otherRefType     Any type held by a wxCFRef.
+        @param otherRef The strong ref holder to copy.
+        @discussion This ref is merely a pointer copy, the strong ref still holds the pointer.
+    */
+    template <class otherRefType>
+    wxCFWeakRef(const wxCFRef<otherRefType>& otherRef)
+    :   m_ptr(otherRef.get()) // Implicit conversion from otherRefType to refType should occur
+    {}
+
+    /*! @method     get
+        @abstract   Explicit conversion to the underlying pointer type
+        @discussion Allows the caller to explicitly get the underlying pointer.
+    */
+    refType get() const
+    {   return m_ptr; }
+
+    /*! @method     operator refType
+        @abstract   Implicit conversion to the underlying pointer type
+        @discussion Allows the ref to be used in CF function calls.
+    */
+    operator refType() const
+    {   return m_ptr; }
+
+protected:
+    /*! @method     wxCFWeakRef
+        @abstract   Constructs a weak reference to the raw pointer
+        @templatefield otherType    Any type.
+        @param p        The raw pointer to assume ownership of.  May be NULL.
+        @discussion This method is private so that the friend static_cfref_cast can use it
+    */
+    template <class otherType>
+    explicit wxCFWeakRef(otherType *p)
+    :   m_ptr(p) // Implicit conversion from otherType* to refType should occur.
+    {}
+
+    /*! @var m_ptr      The raw pointer.
+    */
+    refType m_ptr;
+};
+
+/*! @class wxCFRef
+    @templatefield  refType     The CF reference type (e.g. CFStringRef, CFRunLoopRef, etc.)
+                                It should already be a pointer.  This is different from
+                                shared_ptr where the template parameter is the pointee type.
+    @discussion Properly retains/releases reference to CoreFoundation objects
+*/
+template <class refType>
+class wxCFRef
+{
+public:
+    /*! @method     wxCFRef
+        @abstract   Creates a NULL reference
+    */
+    wxCFRef()
+    :   m_ptr(NULL)
+    {}
+
+    /*! @method     wxCFRef
+        @abstract   Assumes ownership of p and creates a reference to it.
+        @templatefield otherType    Any type.
+        @param p        The raw pointer to assume ownership of.  May be NULL.
+        @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends
+                    to transfer ownership of that reference to this ref holder.  If the object comes from
+                    a Create or Copy method then this is the correct behavior.  If the object comes from
+                    a Get method then you must CFRetain it yourself before passing it to this constructor.
+                    A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
+                    This method is templated and takes an otherType *p.  This prevents implicit conversion
+                    using an operator refType() in a different ref-holding class type.
+    */
+    template <class otherType>
+    explicit wxCFRef(otherType *p)
+    :   m_ptr(p) // Implicit conversion from otherType* to refType should occur.
+    {}
+
+    /*! @method     wxCFRef
+        @abstract   Copies a ref holder of the same type
+        @param otherRef The other ref holder to copy.
+        @discussion Ownership will be shared by the original ref and the newly created ref. That is,
+                    the object will be explicitly retained by this new ref.
+    */
+    wxCFRef(const wxCFRef& otherRef)
+    :   m_ptr(wxCFRetain(otherRef.m_ptr))
+    {}
+
+    /*! @method     wxCFRef
+        @abstract   Copies a ref holder where its type can be converted to ours
+        @templatefield otherRefType     Any type held by another wxCFRef.
+        @param otherRef The other ref holder to copy.
+        @discussion Ownership will be shared by the original ref and the newly created ref. That is,
+                    the object will be explicitly retained by this new ref.
+    */
+    template <class otherRefType>
+    wxCFRef(const wxCFRef<otherRefType>& otherRef)
+    :   m_ptr(wxCFRetain(otherRef.get())) // Implicit conversion from otherRefType to refType should occur
+    {}
+
+    /*! @method     wxCFRef
+        @abstract   Copies a weak ref holder where its type can be converted to ours
+        @templatefield otherRefType     Any type held by a wxCFWeakRef.
+        @param otherRef The weak ref holder to copy.
+        @discussion Ownership will be taken by this newly created ref. That is,
+                    the object will be explicitly retained by this new ref.
+                    Ownership is most likely shared with some other ref as well.
+    */
+    template <class otherRefType>
+    wxCFRef(const wxCFWeakRef<otherRefType>& otherRef)
+    :   m_ptr(wxCFRetain(otherRef.get())) // Implicit conversion from otherRefType to refType should occur
+    {}
+
+    /*! @method     ~wxCFRef
+        @abstract   Releases (potentially shared) ownership of the ref.
+        @discussion A ref holder instance is always assumed to have ownership so ownership is always
+                    released (CFRelease called) upon destruction.
+    */
+    ~wxCFRef()
+    {   reset(); }
+
+    /*! @method     operator=
+        @abstract   Assigns the other ref's pointer to us when the otherRef is the same type.
+        @param otherRef The other ref holder to copy.
+        @discussion The incoming pointer is retained, the original pointer is released, and this object
+                    is made to point to the new pointer.
+    */
+    wxCFRef& operator=(const wxCFRef& otherRef)
+    {
+        wxCFRetain(otherRef.m_ptr);
+        wxCFRelease(m_ptr);
+        m_ptr = otherRef.m_ptr;
+        return *this;
+    }
+
+    /*! @method     operator=
+        @abstract   Assigns the other ref's pointer to us when the other ref can be converted to our type.
+        @templatefield otherRefType     Any type held by another wxCFRef
+        @param otherRef The other ref holder to copy.
+        @discussion The incoming pointer is retained, the original pointer is released, and this object
+                    is made to point to the new pointer.
+    */
+    template <class otherRefType>
+    wxCFRef& operator=(const wxCFRef<otherRefType>& otherRef)
+    {
+        wxCFRetain(otherRef.get());
+        wxCFRelease(m_ptr);
+        m_ptr = otherRef.get(); // Implicit conversion from otherRefType to refType should occur
+        return *this;
+    }
+
+    /*! @method     get
+        @abstract   Explicit conversion to the underlying pointer type
+        @discussion Allows the caller to explicitly get the underlying pointer.
+    */
+    refType get() const
+    {   return m_ptr; }
+
+    /*! @method     operator refType
+        @abstract   Implicit conversion to the underlying pointer type
+        @discussion Allows the ref to be used in CF function calls.
+    */
+    operator refType() const
+    {   return m_ptr; }
+
+#if 0
+    <   // HeaderDoc is retarded and thinks the GT from operator-> is part of a template param.
+        // So give it that < outside of a comment to fake it out. (if 0 is not a comment to HeaderDoc)
+#endif
+
+    /*! @method     operator-&gt;
+        @abstract   Implicit conversion to the underlying pointer type
+        @discussion This is nearly useless for CF types which are nearly always opaque
+    */
+    refType operator-> () const
+    {   return m_ptr; }
+
+    /*! @method     reset
+        @abstract   Nullifies the reference
+        @discussion Releases ownership (calls CFRelease) before nullifying the pointer.
+    */
+    void reset()
+    {
+        wxCFRelease(m_ptr);
+        m_ptr = NULL;
+    }
+
+    /*! @method     reset
+        @abstract   Sets this to a new reference
+        @templatefield otherType    Any type.
+        @param p        The raw pointer to assume ownership of
+        @discussion The existing reference is released (like destruction).  It is assumed that the caller
+                    has a strong reference to the new p and intends to transfer ownership of that reference
+                    to this ref holder.  Take care to call CFRetain if you received the object from a Get method.
+                    This method is templated and takes an otherType *p.  This prevents implicit conversion
+                    using an operator refType() in a different ref-holding class type.
+    */
+    template <class otherType>
+    void reset(otherType* p)
+    {
+        wxCFRelease(m_ptr);
+        m_ptr = p; // Automatic conversion should occur
+    }
+protected:
+    /*! @var m_ptr      The raw pointer.
+    */
+    refType m_ptr;
+};
+
+/*! @function   wxCFRefFromGet
+    @abstract   Factory function to create wxCFRef from a raw pointer obtained from a Get-rule function
+    @param  p           The pointer to retain and create a wxCFRef from.  May be NULL.
+    @discussion Unlike the wxCFRef raw pointer constructor, this function explicitly retains its
+                argument.  This can be used for functions such as CFDictionaryGetValue() or
+                CFAttributedStringGetString() which return a temporary reference (Get-rule functions).
+                FIXME: Anybody got a better name?
+*/
+template <typename Type>
+inline wxCFRef<Type*> wxCFRefFromGet(Type *p)
+{
+    return wxCFRef<Type*>(wxCFRetain(p));
+}
+
+/*! @function   static_cfref_cast
+    @abstract   Works like static_cast but with a wxCFRef as the argument.
+    @param  refType     Template parameter.  The destination raw pointer type
+    @param  otherRef    Normal parameter.  The source wxCFRef<> object.
+    @discussion This is intended to be a clever way to make static_cast work while allowing
+                the return value to be converted to either a strong ref or a raw pointer
+                while ensuring that the retain count is updated appropriately.
+
+                This is modeled after shared_ptr's static_pointer_cast.  Just as wxCFRef is
+                parameterized on a pointer to an opaque type so is this class.  Note that
+                this differs from shared_ptr which is parameterized on the pointee type.
+
+                FIXME: Anybody got a better name?
+*/
+template <class refType, class otherRefType>
+inline wxCFWeakRef<refType> static_cfref_cast(const wxCFRef<otherRefType> &otherRef);
+
+template <class refType, class otherRefType>
+inline wxCFWeakRef<refType> static_cfref_cast(const wxCFRef<otherRefType> &otherRef)
+{
+    return wxCFWeakRef<refType>(static_cast<refType>(otherRef.get()));
+}
+
+/*! @function   CFRelease
+    @abstract   Overloads CFRelease so that the user is warned of bad behavior.
+    @discussion It is rarely appropriate to retain or release a wxCFRef.  If one absolutely
+                must do it he can explicitly get() the raw pointer
+                Normally, this function is unimplemented resulting in a linker error if used.
+*/
+template <class T>
+inline void CFRelease(const wxCFRef<T*> & cfref) DEPRECATED_ATTRIBUTE;
+
+/*! @function   CFRetain
+    @abstract   Overloads CFRetain so that the user is warned of bad behavior.
+    @discussion It is rarely appropriate to retain or release a wxCFRef.  If one absolutely
+                must do it he can explicitly get() the raw pointer
+                Normally, this function is unimplemented resulting in a linker error if used.
+*/
+template <class T>
+inline void CFRetain(const wxCFRef<T*>& cfref) DEPRECATED_ATTRIBUTE;
+
+// Change the 0 to a 1 if you want the functions to work (no link errors)
+// Neither function will cause retain/release side-effects if implemented.
+#if 0
+template <class T>
+void CFRelease(const wxCFRef<T*> & cfref)
+{
+    CFRelease(cfref.get());
+}
+
+template <class T>
+void CFRetain(const wxCFRef<T*> & cfref)
+{
+    CFRetain(cfref.get());
+}
+#endif
+
+#endif //ndef _WX_MAC_COREFOUNDATION_CFREF_H__
+

include/wx/msw/metafile.h

@@ -88,6 +88,18 @@ public:
     // Should be called at end of drawing
     virtual wxMetafile *Close();
     virtual void SetMapMode(int mode);
+
+#if wxABI_VERSION >= 20805
+    virtual void DoGetTextExtent(const wxString& string,
+                                 wxCoord *x, wxCoord *y,
+                                 wxCoord *descent = NULL,
+                                 wxCoord *externalLeading = NULL,
+                                 const wxFont *theFont = NULL) const;
+#endif // wx ABI 2.8.5+
+
+    // this method shouldn't have been defined here (DoGetTextExtent() is the
+    // correct one) but keep it to avoid breaking binary backwards
+    // compatibility
     virtual void GetTextExtent(const wxString& string, long *x, long *y,
             long *descent = NULL, long *externalLeading = NULL,
             wxFont *theFont = NULL, bool use16bit = false) const;

include/wx/msw/missing.h

@@ -138,6 +138,40 @@
 #define LWA_ALPHA 2
 #endif
 
+#if defined __VISUALC__ && __VISUALC__ <= 1200 && !defined MIIM_BITMAP
+#define MIIM_STRING      0x00000040
+#define MIIM_BITMAP      0x00000080
+#define MIIM_FTYPE       0x00000100
+#define HBMMENU_CALLBACK            ((HBITMAP) -1)
+typedef struct tagMENUINFO
+{
+    DWORD   cbSize;
+    DWORD   fMask;
+    DWORD   dwStyle;
+    UINT    cyMax;
+    HBRUSH  hbrBack;
+    DWORD   dwContextHelpID;
+    DWORD   dwMenuData;
+}   MENUINFO, FAR *LPMENUINFO;
+struct wxMENUITEMINFO_
+{
+    UINT cbSize;
+    UINT fMask;
+    UINT fType;
+    UINT fState;
+    UINT wID;
+    HMENU hSubMenu;
+    HBITMAP hbmpChecked;
+    HBITMAP hbmpUnchecked;
+    DWORD dwItemData;
+    LPTSTR dwTypeData;
+    UINT cch;
+    HBITMAP hbmpItem;
+};
+#else
+#define wxMENUITEMINFO_ MENUITEMINFO
+#endif
+
 /*
  * The following are required for VC++ 5 when the PSDK is not available.
  */

include/wx/popupwin.h

@@ -66,6 +66,8 @@ public:
     #include "wx/motif/popupwin.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/popupwin.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif