This commit was manufactured by cvs2svn to create tag 'wxPy_2_6_3_3'.

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

Makefile.in

@@ -1496,6 +1496,14 @@ COND_TOOLKIT_X11_BASE_MACOSX_HDR =  \
 @COND_TOOLKIT_X11@BASE_MACOSX_HDR = $(COND_TOOLKIT_X11_BASE_MACOSX_HDR)
 @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_MACOSX_HDR)
 @COND_PLATFORM_MSDOS_1@BASE_PLATFORM_HDR = wx/msdos/mimetype.h
+COND_PLATFORM_OS2_1_BASE_PLATFORM_HDR =  \
+	wx/os2/apptbase.h \
+	wx/os2/apptrait.h \
+	wx/os2/mimetype.h \
+	wx/os2/private.h \
+	wx/os2/stdpaths.h \
+	wx/os2/wxrsc.h
+@COND_PLATFORM_OS2_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_OS2_1_BASE_PLATFORM_HDR)
 COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR =  \
 	wx/unix/apptbase.h \
 	wx/unix/apptrait.h \
@@ -3139,6 +3147,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_stattext.o \
 	monodll_statusbr.o \
 	monodll_textctrl.o \
+	monodll_tglbtn.o \
 	monodll_theme.o \
 	monodll_toolbar.o \
 	monodll_topluniv.o \
@@ -4609,6 +4618,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_stattext.o \
 	monolib_statusbr.o \
 	monolib_textctrl.o \
+	monolib_tglbtn.o \
 	monolib_theme.o \
 	monolib_toolbar.o \
 	monolib_topluniv.o \
@@ -6317,6 +6327,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_stattext.o \
 	coredll_statusbr.o \
 	coredll_textctrl.o \
+	coredll_tglbtn.o \
 	coredll_theme.o \
 	coredll_toolbar.o \
 	coredll_topluniv.o \
@@ -7515,6 +7526,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_stattext.o \
 	corelib_statusbr.o \
 	corelib_textctrl.o \
+	corelib_tglbtn.o \
 	corelib_theme.o \
 	corelib_toolbar.o \
 	corelib_topluniv.o \
@@ -13245,6 +13257,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
 
+@COND_USE_GUI_1_WXUNIV_1@monodll_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
 
@@ -16716,6 +16731,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
 
+@COND_USE_GUI_1_WXUNIV_1@monolib_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
 
@@ -20616,6 +20634,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
 
+@COND_USE_GUI_1_WXUNIV_1@coredll_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
 
@@ -23127,6 +23148,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
 
+@COND_USE_GUI_1_WXUNIV_1@corelib_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
 
@@ -25612,6 +25636,11 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	rm -rf $(DISTDIR)/wxPython/contrib/iewin
 	find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
 
+	@# copy the bakefiles goop that make install doesn't handle robustly
+	mkdir -p $(DISTDIR)/build/bakefiles/wxpresets/presets
+	cp $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl	\
+	   $(DISTDIR)/build/bakefiles/wxpresets/presets
+
 	rm -rf $(DEBIAN_SOURCE_DIR)
 	mv $(DISTDIR) $(DEBIAN_SOURCE_DIR)
 

build/aclocal/bakefile.m4

@@ -421,6 +421,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
 
       powerpc-apple-macos* | \
       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
+      *-*-mirbsd* | \
       *-*-sunos4* | \
       *-*-osf* | \
       *-*-dgux5* | \

build/bakefiles/files.bkl

@@ -229,7 +229,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/apptbase.h
     wx/os2/apptrait.h
     wx/os2/mimetype.h
+    wx/os2/private.h
     wx/os2/stdpaths.h
+    wx/os2/wxrsc.h
 </set>
 
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -2279,6 +2281,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/stattext.cpp
     src/univ/statusbr.cpp
     src/univ/textctrl.cpp
+    src/univ/tglbtn.cpp
     src/univ/theme.cpp
     src/univ/toolbar.cpp
     src/univ/topluniv.cpp
@@ -2804,6 +2807,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_HDR)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
+        <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
     </set>
 
     <set var="BASE_SRC" hints="files">

build/bakefiles/make_dist.mk

@@ -1195,6 +1195,11 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	rm -rf $(DISTDIR)/wxPython/contrib/iewin
 	find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
 
+	@# copy the bakefiles goop that make install doesn't handle robustly
+	mkdir -p $(DISTDIR)/build/bakefiles/wxpresets/presets
+	cp $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl	\
+	   $(DISTDIR)/build/bakefiles/wxpresets/presets
+
 	rm -rf $(DEBIAN_SOURCE_DIR)
 	mv $(DISTDIR) $(DEBIAN_SOURCE_DIR)
 

configure

@@ -892,6 +892,7 @@ Optional Features:
   --enable-universal_binary create Mac PowerPC and Intel Universal binary (not yet working)
   --enable-compat22       enable wxWidgets 2.2 compatibility
   --disable-compat24      disable wxWidgets 2.4 compatibility
+  --disable-reserved_virtual do not create unused vtable entries
   --disable-rpath         disable use of rpath for uninstalled builds
   --enable-intl           use internationalization system
   --enable-config         use wxConfig (and derived) classes
@@ -1669,7 +1670,7 @@ test -n "$target_alias" &&
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=3
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -4241,6 +4242,49 @@ echo "${ECHO_T}no" >&6
           fi
 
 
+DEFAULT_WX_USE_RESERVED_VIRTUALS=yes
+
+	  enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-reserved_virtual" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-reserved_virtual... $ECHO_C" >&6
+          no_cache=0
+          # Check whether --enable-reserved_virtual or --disable-reserved_virtual was given.
+if test "${enable_reserved_virtual+set}" = set; then
+  enableval="$enable_reserved_virtual"
+
+                          if test "$enableval" = yes; then
+                            ac_cv_use_reserved_virtual='WX_USE_RESERVED_VIRTUALS=yes'
+                          else
+                            ac_cv_use_reserved_virtual='WX_USE_RESERVED_VIRTUALS=no'
+                          fi
+
+else
+
+                          LINE=`grep "WX_USE_RESERVED_VIRTUALS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_reserved_virtual='WX_USE_RESERVED_VIRTUALS='$DEFAULT_WX_USE_RESERVED_VIRTUALS
+
+fi;
+
+          eval "$ac_cv_use_reserved_virtual"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_reserved_virtual >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$WX_USE_RESERVED_VIRTUALS" = 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=
           echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rpath" >&5
@@ -38289,6 +38333,13 @@ _ACEOF
 
 fi
 
+if test "x$WX_USE_RESERVED_VIRTUALS" != "xno"; then
+    cat >>confdefs.h <<\_ACEOF
+#define WX_USE_RESERVED_VIRTUALS 1
+_ACEOF
+
+fi
+
 
 if test "$wxUSE_GUI" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
@@ -42353,11 +42404,6 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then
 echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;}
         wxUSE_TOGGLEBTN=no
     fi
-    if test "$wxUSE_UNIVERSAL" = "yes"; then
-        { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under wxUniversal... disabled" >&5
-echo "$as_me: WARNING: Toggle button not yet supported under wxUniversal... disabled" >&2;}
-        wxUSE_TOGGLEBTN=no
-    fi
 
     if test "$wxUSE_TOGGLEBTN" = "yes"; then
         cat >>confdefs.h <<\_ACEOF

configure.in

@@ -33,7 +33,7 @@ dnl wx_release_number += 1
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=3
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -185,7 +185,7 @@ case "${host}" in
     AC_DEFINE(__BSD__)
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
-  *-*-openbsd*)
+  *-*-openbsd*|*-*-mirbsd*)
     USE_BSD=1
     USE_OPENBSD=1
     AC_DEFINE(__OPENBSD__)
@@ -857,6 +857,9 @@ WX_ARG_ENABLE(universal_binary, [  --enable-universal_binary create Mac PowerPC
 WX_ARG_ENABLE(compat22,      [  --enable-compat22       enable wxWidgets 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
 WX_ARG_ENABLE(compat24,      [  --disable-compat24      disable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
 
+DEFAULT_WX_USE_RESERVED_VIRTUALS=yes
+WX_ARG_ENABLE(reserved_virtual, [  --disable-reserved_virtual do not create unused vtable entries], WX_USE_RESERVED_VIRTUALS)
+
 WX_ARG_ENABLE(rpath,         [  --disable-rpath         disable use of rpath for uninstalled builds], wxUSE_RPATH)
 
 
@@ -5073,6 +5076,10 @@ if test "x$WXWIN_COMPATIBILITY_2_4" != "xno"; then
     AC_DEFINE(WXWIN_COMPATIBILITY_2_4)
 fi
 
+if test "x$WX_USE_RESERVED_VIRTUALS" != "xno"; then
+    AC_DEFINE(WX_USE_RESERVED_VIRTUALS)
+fi
+
 dnl ---------------------------------------------------------------------------
 dnl the library may be built without GUI classes at all
 dnl ---------------------------------------------------------------------------
@@ -6311,10 +6318,6 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then
         AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
         wxUSE_TOGGLEBTN=no
     fi
-    if test "$wxUSE_UNIVERSAL" = "yes"; then
-        AC_MSG_WARN([Toggle button not yet supported under wxUniversal... disabled])
-        wxUSE_TOGGLEBTN=no
-    fi
 
     if test "$wxUSE_TOGGLEBTN" = "yes"; then
         AC_DEFINE(wxUSE_TOGGLEBTN)

contrib/src/gizmos/editlbox.cpp

@@ -228,6 +228,12 @@ void wxEditableListBox::OnEndLabelEdit(wxListEvent& event)
         // add new empty line here so that adding one more line is still
         // possible:
         m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), wxEmptyString);
+
+        // Simulate a wxEVT_COMMAND_LIST_ITEM_SELECTED event for the new item,
+        // so that the buttons are enabled/disabled properly
+        wxListEvent selectionEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED, m_listCtrl->GetId());
+        selectionEvent.m_itemIndex = event.GetIndex();
+        m_listCtrl->GetEventHandler()->ProcessEvent(selectionEvent);
     }
 }
 

contrib/src/stc/ScintillaWX.cpp

@@ -483,7 +483,10 @@ void ScintillaWX::Paste() {
     if (gotData) {
         wxString   text = wxTextBuffer::Translate(data.GetText(),
                                                   wxConvertEOLMode(pdoc->eolMode));
+  data.SetText(wxEmptyString); // free the data object content
         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+  text = wxEmptyString; // free text
+
         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
@@ -827,13 +830,15 @@ void ScintillaWX::DoLeftButtonDown(Point pt, unsigned int curTime, bool shift, b
 }
 
 void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) {
+    ButtonUp(pt, curTime, ctrl);
 #if wxUSE_DRAG_AND_DROP
     if (startDragTimer->IsRunning()) {
         startDragTimer->Stop();
+        SetDragPosition(invalidPosition);
         SetEmptySelection(PositionFromLocation(pt));
+        ShowCaretAtCurrentPosition();
     }
 #endif // wxUSE_DRAG_AND_DROP
-    ButtonUp(pt, curTime, ctrl);
 }
 
 void ScintillaWX::DoLeftButtonMove(Point pt) {

contrib/src/stc/scintilla/src/Editor.cxx

@@ -213,7 +213,7 @@ void LineLayoutCache::Allocate(int length_) {
 }
 
 void LineLayoutCache::AllocateForLevel(int linesOnScreen, int linesInDoc) {
-	PLATFORM_ASSERT(useCount == 0);
+//	PLATFORM_ASSERT(useCount == 0);
 	int lengthForLevel = 0;
 	if (level == llcCaret) {
 		lengthForLevel = 1;
@@ -239,7 +239,7 @@ void LineLayoutCache::AllocateForLevel(int linesOnScreen, int linesInDoc) {
 }
 
 void LineLayoutCache::Deallocate() {
-	PLATFORM_ASSERT(useCount == 0);
+//	PLATFORM_ASSERT(useCount == 0);
 	for (int i = 0; i < length; i++)
 		delete cache[i];
 	delete []cache;

contrib/src/stc/stc.cpp

@@ -3186,12 +3186,7 @@ static void SetEventText(wxStyledTextEvent& evt, const char* text,
                          size_t length) {
     if(!text) return;
 
-    // The unicode conversion MUST have a null byte to terminate the
-    // string so move it into a buffer first and give it one.
-    wxMemoryBuffer buf(length+1);
-    buf.AppendData((void*)text, length);
-    buf.AppendByte(0);
-    evt.SetText(stc2wx(buf));
+    evt.SetText(stc2wx(text, length));
 }
 
 

contrib/src/stc/stc.cpp.in

@@ -854,12 +854,7 @@ static void SetEventText(wxStyledTextEvent& evt, const char* text,
                          size_t length) {
     if(!text) return;
 
-    // The unicode conversion MUST have a null byte to terminate the
-    // string so move it into a buffer first and give it one.
-    wxMemoryBuffer buf(length+1);
-    buf.AppendData((void*)text, length);
-    buf.AppendByte(0);
-    evt.SetText(stc2wx(buf));
+    evt.SetText(stc2wx(text, length));
 }
 
 

debian/README.Debian

@@ -3,6 +3,10 @@ wxwidgets for Debian
 
 The following packages are built from the wxWidgets CVS source.
 
+libwxbase		wxBase runtime shared libraries
+libwxbase-dev		extra files and static libs for building wxBase apps
+libwxbase-dbg		wxBase libraries built with -g and __WXDEBUG__
+
 libwxgtk		wxGTK runtime shared libraries, including selected
 			contrib libs.
 libwxgtk-dev		extra files required for building wxGTK apps
@@ -27,18 +31,12 @@ wx-i18n			message catalogs for native language support
 	among others before reporting this as a bug.
 
 	The following binaries can be built from the source package
-	with the mingw32 cross compiler, but are not currently
-	distributed by Debian.  If you feel that should change,
-	please file a bug against the wxwidgets2.6 package, or
-	append your views to a report already there if you're not
-	the first to do so.
+	with the mingw32 cross compiler, but are not distributed
+	as a part of the main Debian distribution.
 
-	[ you can check the current state of affairs at:
-	  http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwidgets2.6 ]
-
-	Oh and, please do *not* file bug reports for these packages
-	to the Debian bts.  But do feel free to email me personally
-	if you find problems and/or have patches to fix them.
+	Please do *not* file bug reports for these packages to the
+	Debian bts.  But do feel free to email me personally if you
+	find problems and/or have patches to fix them.
 
 libwxmsw-dev		mingw32-cross wxMSW libs.
 libwxmsw-dbg		mingw32-cross wxMSW (debug) libs.
@@ -65,9 +63,14 @@ wx-headers-msw		extra headers needed for wxMSW.
 	builds will automatically parallelise to suit the number of hosts
 	you have listed in DISTCC_HOSTS.  This will work for both native
 	and cross builds of the c++ libraries, if you have the relevant
-	compilers on all your build hosts.  wxPython builds cannot be
-	parallelised at this stage and will run serially regardless of
-	your configuration.
+	compilers on all your build hosts.
+	You may override that heuristic by setting the CONCURRENCY_LEVEL
+	environment variable to the number of jobs you wish make to fork.
+	That variable is also supported by the kernel-package scripts and
+	is respected for consistency here.
+
+	wxPython builds cannot be parallelised at this stage and will run
+	serially regardless of your configuration.
 
 
  -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030

debian/README.examples

@@ -9,6 +9,8 @@ Some of the files have been compressed in accordance with Debian policy
 regarding documentation, you will need to uncompress such files before
 building or executing them.
 
+The unpack_examples.sh script is provided to assist with that.
+
 The examples provided here typically show a minimal implementation of
 the feature(s) they are demonstrating.  There are examples of more
 complete (mini) applications, available in the /wxPython/samples and

debian/changelog

@@ -1,3 +1,50 @@
+wxwidgets2.6 (2.6.3.3-1rpd) unstable; urgency=low
+
+  * wxPython 2.6.3.3 release
+
+ -- Robin Dunn <robin@alldunn.com>  Sat, 15 Jul 2006 15:23:50 -0700
+
+wxwidgets2.6 (2.6.3.2-3rpd) unstable; urgency=low
+
+  * Added icons and *.desktop files for the wpython-wxtools
+
+ -- Robin Dunn <robin@alldunn.com>  Thu,  4 May 2006 15:35:08 -0700
+ 
+wxwidgets2.6 (2.6.3.2) unstable; urgency=low
+
+  * Next try for an upload candidate.
+  * Fixes FTBFS on GNU/kFreeBSD. Closes: #327638
+  * Update fr.po, thanks to Thomas Huriaux and debian-l10n-french.
+    Closes: #328966
+  * Split wxbase back into its own package, after all these years
+    and just after I drop it, someone finally has a use for it.
+    Such is life.  Closes: #333944
+  * Fixes FTBFS with new make.  If this ugly quoting is the tradeoff,
+    I'm itching to learn of the fabulous benefits...
+    Ack NMU for this from Kurt Roeckx to keep the amd64 transition
+    rolling while my x86 build machine was painfully dying.  Thanks!
+    Closes: #350695, #361443
+  * New FSF address in copyright file.
+  * Add an index.html link to the doc contents page.  Closes: #328896
+  * Fixes declarations for friends, as required by C++, and now gcc4.1.
+    Closes: #358219
+  * Add an unpack_examples script, loosely based on one submitted
+    by Richard Esplin.  Closes: #342761
+  * Disable the reserved vtable entries (again, but this time its
+    optional) to retain compatibility with the existing release
+    in the distro.
+  * Update build-deps for xorg7.
+
+ -- Ron Lee <ron@debian.org>  Fri, 14 Apr 2006 16:50:24 +0930
+
+wxwidgets2.6 (2.6.1.2-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Make it build using the new make.  Patch from
+    Daniel Schepler <schepler@math.berkeley.edu> (Closes: #350695)
+
+ -- Kurt Roeckx <kurt@roeckx.be>  Sun,  9 Apr 2006 14:04:34 +0200
+
 wxwidgets2.6 (2.6.1.2) unstable; urgency=low
 
   * Fix the build_options.py created by the in tree build.

debian/control.in

@@ -1,10 +1,63 @@
 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, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev
+Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev
 Maintainer: Ron Lee <ron@debian.org>
 Standards-Version: 3.6.2.1
 
+Package: libwxbase=SOV
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: wxBase library (runtime) - non-GUI support classes of wxWidgets toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...), win32, and BeOS.
+ .
+ This package is only useful for non-GUI apps.  It offers a subset of the
+ classes in libwx_gtk=V for use in console apps and daemons.  You do not need
+ this package to build or use wxWidgets GUI apps.
+
+Package: libwxbase=V-dev
+Architecture: any
+Section: libdevel
+Depends: wx=V-headers (= ${Source-Version}), libwxbase=SOV (= ${Source-Version}), libc6-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
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...), win32, and BeOS.
+ .
+ This package provides the files needed to compile apps using the wxBase
+ library.
+
+Package: libwxbase=V-dbg
+Architecture: any
+Section: libdevel
+Priority: extra
+Depends: wx=V-headers (= ${Source-Version}), libc6-dev
+Description: wxBase library (debug) - non-GUI support classes of wxWidgets toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...) win32, and BeOS.
+ .
+ This package provides a debug version of the wxBase library.  It is compiled
+ both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
+ provides many internal checks by wxWidgets itself that are not performed on
+ apps compiled with the 'release version' libs in the -dev package.
+
 Package: libwxgtk=SOV
 Architecture: any
 Section: libs
@@ -22,7 +75,7 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime)
 Package: libwxgtk=V-dev
 Architecture: any
 Section: libdevel
-Depends: wx=V-headers (= ${Source-Version}), libwxgtk=SOV (= ${Source-Version}), libc6-dev
+Depends: wx=V-headers (= ${Source-Version}), libwxgtk=SOV (= ${Source-Version}), libwxbase=V-dev (= ${Source-Version}), libc6-dev
 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
@@ -37,7 +90,7 @@ Package: libwxgtk=V-dbg
 Architecture: any
 Section: libdevel
 Priority: extra
-Depends: wx=V-headers (= ${Source-Version}), libc6-dev
+Depends: wx=V-headers (= ${Source-Version}), libwxbase=V-dbg (= ${Source-Version}), libc6-dev
 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
@@ -71,8 +124,8 @@ Depends: python-wxversion, =PY, ${shlibs:Depends}
 Conflicts: python-wxgtk=V
 Replaces: python-wxgtk=V
 Provides: python-wxgtk=V
-Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
- wxWindows is a class library for C++ providing GUI (Graphical User
+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.
  .

debian/copyright

@@ -100,8 +100,8 @@ under two different licences:
 
   You should have received a copy of the GNU Library General Public Licence
   along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
+  write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+  Boston, MA 02110-1301, USA.
 
   EXCEPTION NOTICE
 

debian/libwxbase-dbg.postinst

@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config             \
+			      /usr/lib/wx/config/base-unicode-debug-=V \
+			      $(( =PRIO * 10 + 5 ))
+
+#DEBHELPER#
+

debian/libwxbase-dbg.prerm

@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/lib/wx/config/base-unicode-debug-=V
+
+#DEBHELPER#
+

debian/libwxbase-dev.postinst

@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config               \
+			      /usr/lib/wx/config/base-unicode-release-=V \
+			      $(( =PRIO * 10 + 7 ))
+
+#DEBHELPER#
+

debian/libwxbase-dev.prerm

@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/lib/wx/config/base-unicode-release-=V
+
+#DEBHELPER#
+

debian/lintian-override.in

@@ -1,3 +1,6 @@
+libwxbase=V-dbg: non-dev-pkg-with-shlib-symlink
+libwxbase=V-dbg: package-name-doesnt-match-sonames
+libwxbase=SOV: package-name-doesnt-match-sonames
 libwxgtk=V-dbg: non-dev-pkg-with-shlib-symlink
 libwxgtk=V-dbg: package-name-doesnt-match-sonames
 libwxgtk=SOV: package-name-doesnt-match-sonames

debian/pycrust.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=PyCrust
+Comment=GUI Python Shell with Filling
+Exec=/usr/bin/pycrust
+Icon=/usr/share/pixmaps/pycrust.png
+Terminal=false
+Type=Application
+Categories=Application;Development;
+StartupNotify=true

debian/pyshell.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=PyShell
+Comment=GUI Python Shell
+Exec=/usr/bin/pyshell
+Icon=/usr/share/pixmaps/pyshell.png
+Terminal=false
+Type=Application
+Categories=Application;Development;
+StartupNotify=true

debian/python-wxgtk-dbg.postinst

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+WXPYTHONDIR="/=WXPYDIR"
+
+if [ "$1" = "configure" ]; then
+	=PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
+	=PY -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
+fi
+
+update-alternatives --install /usr/lib/=PY/site-packages/wx.pth  wx.pth	\
+			      /usr/lib/wx/python/wx=V-dbg.pth    $(( =PRIO - 10 ))
+
+#DEBHELPER#
+

debian/python-wxgtk-dbg.prerm

@@ -2,8 +2,10 @@
 
 set -e
 
-PACKAGE="libwxgtk=SOV-python"
+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
+
 #DEBHELPER#
 

debian/python-wxgtk.postinst

@@ -9,5 +9,8 @@ if [ "$1" = "configure" ]; then
 	=PY -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
 fi
 
+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,8 +2,10 @@
 
 set -e
 
-PACKAGE="libwxgtk=SOV-dbg-python"
+PACKAGE="python-wxgtk=V"
 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.pth
+
 #DEBHELPER#
 

debian/python-wxtools.menu

@@ -0,0 +1,10 @@
+?package(python-wxtools):needs="X11" section="Apps/Programming"\
+  title="pycrust" command="/usr/bin/pycrust"\
+  icon="/usr/share/pixmaps/pycrust.png"
+?package(python-wxtools):needs="X11" section="Apps/Programming"\
+  title="pyshell" command="/usr/bin/pyshell"\
+  icon="/usr/share/pixmaps/pyshell.png" 
+?package(python-wxtools):needs="X11" section="Apps/Programming"\
+  title="xrced" command="/usr/bin/xrced"
+  icon="/usr/share/pixmaps/xrced.png"
+

debian/rules

@@ -9,23 +9,41 @@
 #export DH_VERBOSE=1
 export DH_OPTIONS
 
-ifdef DISTCC_HOSTS
+ifdef CONCURRENCY_LEVEL
 
- #JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# + $$\#)))
- # Nearly as fast, but doesn't raise the room temperature
- # or saturate the build machines quite so much.
+  # 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 $$\#)
-  FAST_MAKE  = $(MAKE) -j $(JOB_COUNT)
 
-else
-
-  FAST_MAKE = $(MAKE)
+ # 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
+  FAST_MAKE  = $(MAKE) -j $(JOB_COUNT)
+else
+  FAST_MAKE = $(MAKE)
+endif
+
 -include debian/python-version
 
 
+# If another source package is to supply the common binary packages
+# for a particular Debian release, then define this variable to indicate
+# the $(release) that is expected to provide it.  Do not define it at
+# all if this is to be the default (or only) wx source package for the
+# target release.
+#
+# for etch:
+#DEBIAN_WX_DEFAULT_VERSION = 2.6
+
+
 # This will extract a flavour out of the name of the source directory
 # and flavour the packages and binaries with it.  'Official' builds
 # should use a source dir of the form wxwidgets$RELEASE-$VERSION.
@@ -56,33 +74,62 @@ pytoolkit := gtk2
 pydir     := usr/lib/$(python_ver)/site-packages
 wxpydir   := $(pydir)/wx-$(release)-$(pytoolkit)-unicode
 
-cross_host  = i586-mingw32msvc
-cross_build = $(shell ./config.guess)
+cross_host  := i586-mingw32msvc
+cross_build := $(shell ./config.guess)
 
 config_cache       = ../config_deb.cache
 config_cache_cross = ../config_deb_cross.cache
 
+
 # Packages to build:
-package_gtk_lib         = libwxgtk$(sorelease)
-package_gtk_dev         = libwxgtk$(release)-dev
-package_gtk_dbg         = libwxgtk$(release)-dbg
+package_wxbase_lib      := libwxbase$(sorelease)
+package_wxbase_dev      := libwxbase$(release)-dev
+package_wxbase_dbg      := libwxbase$(release)-dbg
 
-package_gtk_py_lib      = python-wxgtk$(release)
-package_gtk_py_ver      = python-wxversion
-package_gtk_py_tools    = python-wxtools
+package_gtk_lib         := libwxgtk$(sorelease)
+package_gtk_dev         := libwxgtk$(release)-dev
+package_gtk_dbg         := libwxgtk$(release)-dbg
 
-package_common          = wx-common
-package_headers         = wx$(release)-headers
-package_i18n            = wx$(release)-i18n
-package_doc             = wx$(release)-doc
-package_examples        = wx$(release)-examples
 
-package_gtk_dbg_py      = python-wxgtk$(release)-dbg
-package_msw_dev         = libwxmsw$(release)-dev
-package_msw_dbg         = libwxmsw$(release)-dbg
-package_headers_msw     = wx$(release)-headers-msw
+
+
+package_gtk_py_lib      := python-wxgtk$(release)
+package_gtk_py_ver       = python-wxversion
+package_gtk_py_tools     = python-wxtools
+
+package_headers         := wx$(release)-headers
+package_i18n            := wx$(release)-i18n
+package_doc             := wx$(release)-doc
+package_examples        := wx$(release)-examples
+package_common           = wx-common
+
+# 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_dbg_py      := python-wxgtk$(release)-dbg
+
+
+
+package_msw_dev         := libwxmsw$(release)-dev
+package_msw_dbg         := libwxmsw$(release)-dbg
+package_headers_msw     := wx$(release)-headers-msw
+
+# The packages listed here will not be built by default.
+extra_packages := $(package_gtk_dbg_py)                                      \
+		  $(package_msw_dev) $(package_msw_dbg) $(package_headers_msw)
+
+ifdef DEBIAN_WX_DEFAULT_VERSION
+
+  extra_packages += $(common_packages)
+
+endif
+
 
 # Build directories:
+objdir_wxbase_shared       = objs_wxbase_sh
+objdir_wxbase_debug        = objs_wxbase_d
 objdir_gtk_shared          = objs_gtk_sh
 objdir_gtk_debug           = objs_gtk_d
 objdir_gtk_install         = objs_gtk_install
@@ -96,10 +143,11 @@ objdir_msw_static          = objs_msw_st
 objdir_msw_dbg             = objs_msw_d
 objdir_msw_install         = objs_msw_install
 
-objdirs = $(objdir_gtk_shared) $(objdir_gtk_debug) $(objdir_gtk_install)  \
-	  $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples)            \
-	  $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)     \
-	  $(objdir_msw_install)
+objdirs := $(objdir_wxbase_shared) $(objdir_wxbase_debug)                  \
+	   $(objdir_gtk_shared) $(objdir_gtk_debug) $(objdir_gtk_install)  \
+	   $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples)            \
+	   $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)     \
+	   $(objdir_msw_install)
 
 #	note that the i18n package is actually arch indep (once built)
 #	but must be built (and installed) during the arch any phase as
@@ -110,32 +158,39 @@ objdirs = $(objdir_gtk_shared) $(objdir_gtk_debug) $(objdir_gtk_install)  \
 
 
 # Build stamps:
-build_arch_stamps = build-gtk-shared-stamp build-gtk-shared-contrib-stamp \
+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_indep_stamps = build-examples-stamp build-doc-stamp
 
-build_indep_stamps  = build-examples-stamp build-doc-stamp
+build_cross_stamps = build-msw-shared-stamp build-msw-static-stamp build-msw-dbg-stamp
 
-build_cross_stamps  = build-msw-shared-stamp build-msw-static-stamp build-msw-dbg-stamp
+build_stamps_native := $(build_arch_stamps) $(build_indep_stamps)
 
-build_stamps_native = $(build_arch_stamps) $(build_indep_stamps)
-
-build_stamps = $(build_stamps_native) $(build_cross_stamps)
+build_stamps := $(build_stamps_native) $(build_cross_stamps)
 
 
 # Install targets:
-install_all_arch = install-gtk-lib install-gtk-dev install-gtk-dbg        \
-                   install-common install-headers install-i18n            \
+install_all_arch = install-wxbase-lib install-wxbase-dev install-wxbase-dbg  \
+                   install-gtk-lib install-gtk-dev install-gtk-dbg        \
+                   install-headers install-i18n            \
                    install-gtk-py
 
-install_all_indep  = install-examples install-doc
+ifndef DEBIAN_WX_DEFAULT_VERSION
 
-install_all_cross  = install-msw-dev install-msw-dbg install-headers-msw
+  install_all_arch += install-common
 
-install_all_native = $(install_all_arch) $(install_all_indep)
+endif
 
-install_all = $(install_all_native) $(install_all_cross)
+install_all_indep = install-examples install-doc
+
+install_all_cross = install-msw-dev install-msw-dbg install-headers-msw
+
+install_all_native := $(install_all_arch) $(install_all_indep)
+
+install_all := $(install_all_native) $(install_all_cross)
 
 
 # wxPython uses this to build in-tree
@@ -158,41 +213,53 @@ 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' \
+	sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g'\
 		< debian/control.in > debian/control
 
 control-files-stamp: debian/control
 	dh_testdir
+	@for f in postinst prerm; do                                         \
+		echo "generating control file $(package_wxbase_dev).$$f";    \
+		sed -e 's/=V/$(release)/g;                                  '\
+'			s/=PRIO/$(alt_prio)/g'                               \
+			< debian/libwxbase-dev.$$f                           \
+			> debian/$(package_wxbase_dev).$$f;                  \
+	done;
+	@for f in postinst prerm; do                                         \
+		echo "generating control file $(package_wxbase_dbg).$$f";    \
+		sed -e 's/=V/$(release)/g;                                  '\
+'			s/=PRIO/$(alt_prio)/g'                               \
+			< debian/libwxbase-dbg.$$f                           \
+			> debian/$(package_wxbase_dbg).$$f;                  \
+	done;
 	@for f in postinst prerm; do                                         \
 		echo "generating control file $(package_gtk_dev).$$f";       \
-		sed -e 's/=V/$(release)/g;                                   \
-			s/=PRIO/$(alt_prio)/g'                               \
+		sed -e 's/=V/$(release)/g;                                  '\
+'			s/=PRIO/$(alt_prio)/g'                               \
 			< debian/libwxgtk-dev.$$f                            \
 			> debian/$(package_gtk_dev).$$f;                     \
 	done;
 	@for f in postinst prerm; do                                         \
 		echo "generating control file $(package_gtk_dbg).$$f";       \
-		sed -e 's/=V/$(release)/g;                                   \
-			s/=PRIO/$(alt_prio)/g'                               \
+		sed -e 's/=V/$(release)/g;                                  '\
+'			s/=PRIO/$(alt_prio)/g'                               \
 			< debian/libwxgtk-dbg.$$f                            \
 			> debian/$(package_gtk_dbg).$$f;                     \
 	done;
 	@for f in docs postinst prerm; do                                    \
 		echo "generating control file $(package_gtk_py_lib).$$f";    \
-		sed -e 's/=PY/$(python_ver)/g;                               \
-			s|=WXPYDIR|$(wxpydir)|g;                             \
-			s/=V/$(release)/g;                                   \
-			s/=PRIO/$(alt_prio)/g'                               \
+		sed -e 's/=PY/$(python_ver)/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'                               \
+		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;
@@ -209,17 +276,17 @@ control-files-stamp: debian/control
 	done;
 	@for f in postinst prerm; do                                         \
 		echo "generating control file $(package_msw_dev).$$f";       \
-		sed -e 's/=V/$(release)/g;                                   \
-			s/=PRIO/$(alt_prio)/g;                               \
-			s/=H/$(cross_host)/g'                                \
+		sed -e 's/=V/$(release)/g;                                  '\
+'			s/=H/$(cross_host)/g;                               '\
+'			s/=PRIO/$(alt_prio)/g'                               \
 			< debian/libwxmsw-dev.$$f                            \
 			> debian/$(package_msw_dev).$$f;                     \
 	done;
 	@for f in postinst prerm; do                                         \
 		echo "generating control file $(package_msw_dbg).$$f";       \
-		sed -e 's/=V/$(release)/g;                                   \
-			s/=PRIO/$(alt_prio)/g;                               \
-			s/=H/$(cross_host)/g'                                \
+		sed -e 's/=V/$(release)/g;                                  '\
+'			s/=H/$(cross_host)/g;                               '\
+'			s/=PRIO/$(alt_prio)/g'                               \
 			< debian/libwxmsw-dbg.$$f                            \
 			> debian/$(package_msw_dbg).$$f;                     \
 	done;
@@ -227,8 +294,8 @@ control-files-stamp: debian/control
 #		sed -e 's/=V/$(release)/g' < debian/wx-common.menu           \
 #			> debian/$(package_common).menu;
 	@echo "generating control file lintian-override";                    \
-		sed -e 's/=V/$(release)/g;                                   \
-			s/=SOV/$(sorelease)/g'                               \
+		sed -e 's/=V/$(release)/g;                                  '\
+'			s/=SOV/$(sorelease)/g'                               \
 			< debian/lintian-override.in                         \
 			> debian/lintian-override;                           \
 	touch $@
@@ -245,6 +312,51 @@ build_all: control-files-stamp $(build_stamps_native)
 build: build_arch
 
 
+# The wx2.6 build system makes us run around in circles to get a separate
+# 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.
+
+configure-wxbase-shared-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_shared)
+	cd $(objdir_wxbase_shared) 					\
+		&& ../configure --prefix=/usr 				\
+				--cache-file=$(config_cache) 		\
+				--with-flavour=$(DEBIAN_WXFLAVOUR)	\
+				--disable-gui 				\
+				--with-zlib=sys				\
+				--enable-unicode			\
+				--disable-reserved_virtual
+	touch $@
+
+build-wxbase-shared-stamp: configure-wxbase-shared-stamp
+	dh_testdir
+	# Nothing to build here, move along...
+	#cd $(objdir_wxbase_shared) && $(FAST_MAKE)
+	touch $@
+
+configure-wxbase-debug-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_debug)
+	cd $(objdir_wxbase_debug) 					\
+		&& ../configure --prefix=/usr 				\
+				--cache-file=$(config_cache) 		\
+				--with-flavour=$(DEBIAN_WXFLAVOUR)	\
+				--disable-gui 				\
+				--enable-debug 				\
+				--with-zlib=sys				\
+				--enable-unicode			\
+				--disable-reserved_virtual
+	touch $@
+
+build-wxbase-debug-stamp: configure-wxbase-debug-stamp
+	dh_testdir
+	# Nothing to build here, move along...
+	#cd $(objdir_wxbase_debug) && $(FAST_MAKE)
+	touch $@
+
 configure-gtk-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_shared)
@@ -259,7 +371,8 @@ configure-gtk-shared-stamp:
 				--with-libjpeg=sys			\
 				--with-libpng=sys			\
 				--with-libtiff=sys			\
-				--enable-unicode
+				--enable-unicode			\
+				--disable-reserved_virtual
 	touch $@
 
 build-gtk-shared-stamp: configure-gtk-shared-stamp
@@ -283,7 +396,8 @@ configure-gtk-debug-stamp:
 				--with-libpng=sys			\
 				--with-libtiff=sys			\
 				--enable-debug				\
-				--enable-unicode
+				--enable-unicode			\
+				--disable-reserved_virtual
 	touch $@
 
 build-gtk-debug-stamp: configure-gtk-debug-stamp
@@ -359,6 +473,11 @@ build-examples-stamp: build-gtk-shared-stamp
 
 	cp -a wxPython/demo $(objdir_examples)/wxPython
 
+	echo "generating install_examples.sh script";
+	sed -e 's/=V/$(release)/g' < debian/unpack_examples.sh.in	\
+				   > debian/unpack_examples.sh
+	chmod 755 debian/unpack_examples.sh
+
 	touch $@
 
 build-i18n-stamp: build-gtk-shared-stamp
@@ -460,6 +579,9 @@ clean: debian/control clean-py
 	rm -f $(objdir_i18n)/*.mo
 
 	dh_clean
+	rm -f debian/$(package_wxbase_lib).*
+	rm -f debian/$(package_wxbase_dev).*
+	rm -f debian/$(package_wxbase_dbg).*
 	rm -f debian/$(package_gtk_lib).*
 	rm -f debian/$(package_gtk_dev).*
 	rm -f debian/$(package_gtk_dbg).*
@@ -472,11 +594,45 @@ clean: debian/control clean-py
 	rm -f debian/$(package_msw_dev).*
 	rm -f debian/$(package_msw_dbg).*
 	rm -f debian/lintian-override
+	rm -f debian/unpack_examples.sh
 
 install_arch: build_arch $(install_all_arch)
 
 install: build_all $(install_all_native)
 
+
+install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
+install-wxbase-lib: build-wxbase-shared-stamp install-gtk-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	@# No, this is not a typo, we steal these libs from the gtk build.
+	dh_install $(objdir_gtk_install)/lib/libwx_base*.so.*	usr/lib
+	dh_installdirs usr/share/lintian/overrides
+	cp debian/lintian-override debian/$(package_wxbase_lib)/usr/share/lintian/overrides/$(package_wxbase_lib)
+
+install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
+install-wxbase-dev: build-wxbase-shared-stamp install-gtk-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	@# No, this is not a typo, we steal these libs from the gtk build.
+	dh_install $(objdir_gtk_install)/lib/libwx_base*.so 	usr/lib
+	dh_install $(objdir_wxbase_shared)/lib/wx/include 	usr/lib/wx
+	dh_install $(objdir_wxbase_shared)/lib/wx/config/base*	usr/lib/wx/config
+
+install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
+install-wxbase-dbg: build-wxbase-debug-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	@# No, this is not a typo, we steal these libs from the gtk debug build.
+	dh_install $(objdir_gtk_debug)/lib/libwx_base*		usr/lib
+	dh_install $(objdir_wxbase_debug)/lib/wx/include	usr/lib/wx
+	dh_install $(objdir_wxbase_debug)/lib/wx/config/base*	usr/lib/wx/config
+	dh_installdirs usr/share/lintian/overrides
+	cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
+
 install-gtk-shared-stamp: build-gtk-shared-stamp build-gtk-shared-contrib-stamp
 	dh_testdir
 	mkdir -p $(objdir_gtk_install)
@@ -491,7 +647,7 @@ install-gtk-lib: install-gtk-shared-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_install $(objdir_gtk_install)/lib/libwx_*.so.*	usr/lib
+	dh_install $(objdir_gtk_install)/lib/libwx_gtk*.so.*	usr/lib
 	dh_installdirs usr/share/lintian/overrides
 	cp debian/lintian-override debian/$(package_gtk_lib)/usr/share/lintian/overrides/$(package_gtk_lib)
 
@@ -500,7 +656,7 @@ install-gtk-dev: install-gtk-shared-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_install $(objdir_gtk_install)/lib/libwx_*.so 	usr/lib
+	dh_install $(objdir_gtk_install)/lib/libwx_gtk*.so 	usr/lib
 	dh_install $(objdir_gtk_install)/lib/wx/include 	usr/lib/wx
 	dh_install $(objdir_gtk_install)/lib/wx/config/gtk* 	usr/lib/wx/config
 
@@ -509,7 +665,7 @@ install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_install $(objdir_gtk_debug)/lib/libwx_*		usr/lib
+	dh_install $(objdir_gtk_debug)/lib/libwx_gtk*		usr/lib
 	dh_install $(objdir_gtk_debug)/lib/wx/include		usr/lib/wx
 	dh_install $(objdir_gtk_debug)/lib/wx/config/gtk*	usr/lib/wx/config
 	dh_installdirs usr/share/lintian/overrides
@@ -545,7 +701,12 @@ install-gtk-py-ver: install-gtk-py-lib
 	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
@@ -553,8 +714,9 @@ install-gtk-py-tools: install-gtk-py-ver
 	dh_testroot
 	dh_clean -k
 
+ifndef DEBIAN_WX_DEFAULT_VERSION
+
 	dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) usr/bin
-	rm -r 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     \
@@ -571,6 +733,18 @@ install-gtk-py-tools: install-gtk-py-ver
 
 	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: install-gtk-py-tools
 
@@ -618,6 +792,11 @@ install-doc: build-doc-stamp
 	dh_testroot
 	dh_clean -k
 
+	@# 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
@@ -725,7 +904,8 @@ binary-common:
 
 	@# 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_msw_dev) -N$(package_msw_dbg)
+	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) \
+		 -N$(package_msw_dev) -N$(package_msw_dbg)
 
 	dh_compress
 	dh_fixperms
@@ -748,13 +928,13 @@ binary-common:
 # building the arch specific package files needed to create them.
 binary-indep: build_all install
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-i -N$(package_gtk_dbg_py) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
+		DH_OPTIONS="-i $(addprefix -N,$(extra_packages))" \
 		binary-common
 
 # Build just the architecture-dependent files here.
 binary-arch: build_arch install_arch
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-a -N$(package_gtk_dbg_py) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
+		DH_OPTIONS="-a $(addprefix -N,$(extra_packages))" \
 		binary-common
 
 # Build all packages target.
@@ -810,7 +990,9 @@ binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers
 .PHONY: build build_all build_arch					\
 	clean clean-py purge-release-py purge-dbg-py			\
 	binary-indep binary-arch binary binary-common 			\
-        binary-gtk binary-gtk-dev binary-gtk-dbg binary-doc binary-cross \
+	binary-gtk binary-gtk-dev binary-gtk-dbg			\
+	binary-wxbase binary-wxbase-dev binary-wxbase-dbg		\
+	binary-doc binary-cross binary-dbg-py				\
 	install install_arch install-gtk-lib install-gtk-dev 		\
         install-gtk-dbg                                             	\
 	install-gtk-py install-gtk-py-tools install-gtk-py-ver		\

debian/unpack_examples.sh.in

@@ -0,0 +1,62 @@
+#!/bin/bash
+#
+# Unpack compressed examples from the packaged documentation
+# into a directory where the user can compile and/or run them.
+
+WX_EXAMPLES_DIR="/usr/share/doc/wx=V-examples/examples"
+
+usage() {
+    echo "$0 [subdir [subdir] ...] dest_dir"
+    echo "    subdir   - a subdir of $WX_EXAMPLES_DIR to unpack."
+    echo "    dest_dir - location for the unpacked examples."
+    echo
+    echo "If no subdirs are supplied explicitly, all examples will be unpacked."
+    exit 1
+}
+
+if [ $# -lt 1 ]; then
+    usage
+fi 
+
+while [ $# -gt 1 ]; do
+    SUBDIRS="$SUBDIRS $1"
+    shift
+done
+
+DESTDIR="$1"
+
+if [ -e $DESTDIR ]; then
+    echo "Destination $DESTDIR already exists. Cowardly exiting."
+    exit 2
+fi
+
+if [ -z "$SUBDIRS" ]; then
+    for d in $(cd $WX_EXAMPLES_DIR 2> /dev/null && ls -d * 2> /dev/null); do
+        [ -d "$WX_EXAMPLES_DIR/$d" ] && SUBDIRS="$SUBDIRS $d"
+    done
+else
+    for d in $SUBDIRS; do
+    	if [ -d "$WX_EXAMPLES_DIR/$d" ]; then
+	    _SUBDIRS="$d"
+	else
+	    echo "Subdir $WX_EXAMPLES_DIR/$d does not exist.  Skipping."
+	fi
+    done
+    SUBDIRS="$_SUBDIRS"
+fi
+
+if [ -z "$SUBDIRS" ]; then
+    echo "Nothing to copy from $WX_EXAMPLES_DIR.  Aborting."
+    exit 1
+fi
+
+mkdir -p $DESTDIR
+for d in $SUBDIRS; do
+    echo "Copying $WX_EXAMPLES_DIR/$d to $DESTDIR"
+    cp -pr "$WX_EXAMPLES_DIR/$d" "$DESTDIR"
+done
+
+echo -n "Unpacking... "
+find $DESTDIR -name "*.gz" -exec gunzip {} \;
+echo "done."
+

debian/wx-examples.examples

@@ -1,4 +1,5 @@
 debian/README.examples
+debian/unpack_examples.sh
 docs/examples/samples
 docs/examples/wxPython
 

debian/wxpython.menu

@@ -1,7 +0,0 @@
-?package(wxpython=SOV):needs="X11" section="Apps/Programming"\
-  title="pycrust" command="/usr/bin/pycrust"
-?package(wxpython=SOV):needs="X11" section="Apps/Programming"\
-  title="pyshell" command="/usr/bin/pyshell"
-?package(wxpython=SOV):needs="X11" section="Apps/Programming"\
-  title="xrced" command="/usr/bin/xrced"
-

debian/xrced.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=XRCed
+Comment=wxPython XRC resource editor and UI designer
+Exec=/usr/bin/xrced
+Icon=/usr/share/pixmaps/xrced.png
+Terminal=false
+Type=Application
+Categories=Application;Development;
+StartupNotify=true

distrib/msw/mac.rsp

@@ -71,4 +71,5 @@ include/wx/mac/corefoundation/*.h
 samples/minimal/minimal.pbproj/project.pbxproj
 samples/minimal/minimal.xcode/project.pbxproj
 samples/minimal/minimal.xcodeproj/project.pbxproj
+samples/minimal/Info.plist
 

distrib/scripts/includes/configure_build.inc

@@ -0,0 +1,64 @@
+
+if [ "$INSTALLDIR" = "" ]; then
+  INSTALLDIR=$BUILDDIR/install
+  mkdir -p $INSTALLDIR
+fi
+
+# wxPython needs this option so that it can build extensions that store the 
+# right install_name (e.g. /usr/local/lib) even if the files aren't actually
+# in /usr/local/lib at the time they're being linked against
+# we do this by setting the "official" prefix at build time, and later 
+if [ "$BUILDPREFIX" = "" ]; then
+  BUILDPREFIX=$INSTALLDIR
+fi
+
+
+DEBUG_OPTS="--enable-debug"
+
+UNICODE_OPTS="--enable-unicode"
+
+ANSI_OPTS="--enable-ansi"
+
+WXPYTHON_OPTS="--enable-monolithic \
+	--with-opengl \
+	--enable-sound \
+        --enable-mediactrl \
+	--enable-display \
+	--enable-geometry \
+	--enable-debug_flag \
+	--enable-optimise \
+	--disable-debugreport "
+	
+	
+do_build(){
+    OPTS=""
+    if [ "$WXPYTHON" == "1" ]; then
+      OPTS="$WXPYTHON_OPTS"
+    fi
+    
+    if [ "$DEBUG" == "1" ]; then
+      OPTS="$OPTS $DEBUG_OPTS "
+    fi
+    
+    if [ "$UNICODE" == "1" ]; then
+      OPTS="$OPTS $UNICODE_OPTS "
+    fi
+    
+    
+    
+    if [ "$STATIC" == "1" ]; then
+      OPTS="$OPTS --enable-static"
+    fi
+    
+    OPTS="$OPTS $OTHER_OPTS"
+    
+    $WXROOT/configure --prefix=$BUILDPREFIX $OPTS
+    make
+    
+    # build the libs wxPython needs
+    if [ "$WXPYTHON" == "1" ]; then
+      make -C contrib/src/animate
+      make -C contrib/src/gizmos
+      make -C contrib/src/stc
+    fi
+}

distrib/scripts/mac/mac_options.inc

@@ -0,0 +1,30 @@
+
+UNIVERSAL=0
+WXPYTHON=0
+UNICODE=0
+DEBUG=0
+CARBON=1
+COCOA=0
+STATIC=0
+
+# Process command line options.
+for i in "$@"; do
+    case "$i" in
+	unicode)       UNICODE=1 ;;
+	ansi)          UNICODE=0 ;;
+	debug)         DEBUG=1 ;;
+	wxpython)      WXPYTHON=1 ;;
+	universal)     UNIVERSAL=1 ;;
+	carbon)        CARBON=1 ;;
+	cocoa)         COCOA=1 ;;
+	static)        STATIC=1 ;;
+	*)
+	    usage
+	    exit
+	    ;;
+    esac
+done
+
+if [ "$COCOA" = "1" ]; then
+  OTHER_OPTS="--with-cocoa "
+fi

distrib/scripts/mac/macbuild

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# you need to change this if you run from outside this dir. 
+if [ "$WXROOT" = "" ]; then
+  WXROOT=../../..
+fi
+
+. $WXROOT/distrib/scripts/includes/configure_build.inc
+
+. $WXROOT/distrib/scripts/mac/mac_options.inc
+
+# most of this script is shared with other Mac-based and other
+# configure-based build scripts, which is why this looks a little empty.
+
+if [ "$UNIVERSAL" = "1" ]; then
+  OTHER_OPTS="--enable-universal_binary "
+fi
+
+do_build
+
+make prefix=$INSTALLDIR install
+
+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

docs/changes.txt

@@ -2,12 +2,54 @@
 wxWidgets Change Log - For more verbose changes, see the manual
 ---------------------------------------------------------------
 
+2.6.4
+-----
+
+All:
+
+- wxSocket::_Read continues reading from socket after exhausting pushback buffer.
+  Previously, only the buffer would be returned, even if more data was requested.
+
+All (GUI):
+
+- In wxScrolledWindow:DoGetBestSize, no longer adds difference between client and
+  total size if we've just used the total size as the best size.
+- Fixed problem with zoom setting in print preview.
+
+wxGTK:
+
+- Support underlined fonts in wxTextCtrl.
+- wxWindow and wxScrolledWindow now generate line, page and thumb-release scroll events.
+
+wxUniv:
+
+- Implemented wxToggleButton (David Bjorkevik).
+
+wxMac:
+
+- Fixed non-detection of process termination on Intel Macs by
+  polling for process termination in a separate thread.
+
+wxMGL:
+
+- Fixed NUM_LOCK having no effect.
+- Fixed wxFileExists (affecting wxImage::LoadFile).
+- Implement wxGetMouseState()
+
+wxMotif:
+- Implement wxGetMouseState()
+
+wxX11:
+- Implement wxGetMouseState()
+
+
 2.6.3
 -----
 
 All:
 
 - Fixed crash when loading message catalogs in Unicode build.
+- Fixed crash in wxList code when building with wxUSE_STL=1 (Christoph Schulz)
 - Spurious error message from wxLaunchDefaultBrowser fixed.
 - Compilation fixes for (more strict) g++ 4.1
 - Speed improvements to wxRegEx when matching is done in a loop such as
@@ -93,7 +135,8 @@ wxMSW:
 - Fall back to unthemed wxNotebook if specified orientation not available.
 - Fixed wxChoice/wxComboBox slow appending and infinite recursion
   if its size is set within a paint handler (for example when embedded in a
-  wxHtmlWindow).
+  wxHtmlWindow). [Now reverted due to problems in W2K and below.]
+- Warning fixes for VC++ 5.0 (Igor Korot)
 
 wxWinCE:
 

docs/latex/wx/calctrl.tex

@@ -394,35 +394,35 @@ Display the date with this attribute as a holiday.
 
 \constfunc{bool}{HasTextColour}{\void}
 
-Returns {\tt true} if this item has a non default text foreground colour.
+Returns {\tt true} if this item has a non-default text foreground colour.
 
 
 \membersection{wxCalendarDateAttr::HasBackgroundColour}\label{wxcalendardateattrhasbackgroundcolour}
 
 \constfunc{bool}{HasBackgroundColour}{\void}
 
-Returns {\tt true} if this attribute specifies a non default text background colour.
+Returns {\tt true} if this attribute specifies a non-default text background colour.
 
 
 \membersection{wxCalendarDateAttr::HasBorderColour}\label{wxcalendardateattrhasbordercolour}
 
 \constfunc{bool}{HasBorderColour}{\void}
 
-Returns {\tt true} if this attribute specifies a non default border colour.
+Returns {\tt true} if this attribute specifies a non-default border colour.
 
 
 \membersection{wxCalendarDateAttr::HasFont}\label{wxcalendardateattrhasfont}
 
 \constfunc{bool}{HasFont}{\void}
 
-Returns {\tt true} if this attribute specifies a non default font.
+Returns {\tt true} if this attribute specifies a non-default font.
 
 
 \membersection{wxCalendarDateAttr::HasBorder}\label{wxcalendardateattrhasborder}
 
 \constfunc{bool}{HasBorder}{\void}
 
-Returns {\tt true} if this attribute specifies a non default (i.e. any) border.
+Returns {\tt true} if this attribute specifies a non-default (i.e. any) border.
 
 
 \membersection{wxCalendarDateAttr::IsHoliday}\label{wxcalendardateattrisholiday}

docs/latex/wx/cppconst.tex

@@ -172,7 +172,7 @@ monolithic wxWidgets library, defined as $0$ when building GUI library only)}
 exceptions has been switched off}
 \twocolitem{wxNO\_THREADS}{if this macro is defined, the compilation options
 don't include compiler flags needed for multithreaded code generation. This
-implies that wxUSE\_THREADS is $0$ and also that other (non wx-based) threading
+implies that wxUSE\_THREADS is $0$ and also that other (non-wx-based) threading
 packages cannot be used neither.}
 \end{twocollist}
 

docs/latex/wx/ctrlsub.tex

@@ -20,7 +20,7 @@ It defines the methods for accessing the controls items and although each of
 the derived classes implements them differently, they still all conform to the
 same interface.
 
-The items in a wxControlWithItems have (non empty) string labels and,
+The items in a wxControlWithItems have (non-empty) string labels and,
 optionally, client data associated with them. Client data may be of two
 different kinds: either simple untyped ({\tt void *}) pointers which are simply
 stored by the control but not used in any way by it, or typed pointers

docs/latex/wx/datespan.tex

@@ -19,7 +19,7 @@ one month to Feb, 15 -- we want to get Mar, 15, of course).
 
 When adding a month to the date, all lesser components (days, hours, ...)
 won't be changed unless the resulting date would be invalid: for example,
-Jan 31 + 1 month will be Feb 28, not (non existing) Feb 31.
+Jan 31 + 1 month will be Feb 28, not (non-existing) Feb 31.
 
 Because of this feature, adding and subtracting back again the same
 wxDateSpan will {\bf not}, in general give back the original date: Feb 28 - 1

docs/latex/wx/datetime.tex

@@ -934,7 +934,7 @@ the year is, according to international standards, the one containing Jan 4 or,
 equivalently, the first week which has Thursday in this year. Both of these
 definitions are the same as saying that the first week of the year must contain
 more than half of its days in this year. Accordingly, the week number will
-always be in $1\ldots53$ range ($52$ for non leap years).
+always be in $1\ldots53$ range ($52$ for non-leap years).
 
 The function depends on the \helpref{week start}{wxdatetime} convention
 specified by the {\it flags} argument but its results for

docs/latex/wx/db.tex

@@ -2457,7 +2457,7 @@ this function.
 \param{UWORD }{numIndexColumns}, \param{wxDbIdxDef *}{pIndexDefs},
 \param{bool }{attemptDrop=true}}
 
-This member function allows you to create secondary (non primary) indexes on
+This member function allows you to create secondary (non-primary) indexes on
 your tables.  You first create your table, normally specifying a primary
 index, and then create any secondary indexes on the table.  Indexes in
 relational model are not required.  You do not need indexes to look up records

docs/latex/wx/dir.tex

@@ -12,8 +12,8 @@
 \section{\class{wxDir}}\label{wxdir}
 
 wxDir is a portable equivalent of Unix {open/read/close}dir functions which
-allow enumerating of the files in a directory. wxDir allows enumerate files as
-well as directories.
+allow enumerating of the files in a directory. wxDir allows to enumerate files
+as well as directories.
 
 wxDir also provides a flexible way to enumerate files recursively using 
 \helpref{Traverse}{wxdirtraverse} or a simpler 
@@ -136,8 +136,8 @@ trailing path separator (slash or backslash).
 
 \constfunc{bool}{GetNext}{\param{wxString* }{filename}}
 
-Continue enumerating files satisfying the criteria specified by the last call
-to \helpref{GetFirst}{wxdirgetfirst}.
+Continue enumerating files which satisfy the criteria specified by the last
+call to \helpref{GetFirst}{wxdirgetfirst}.
 
 
 \membersection{wxDir::HasFiles}\label{wxdirhasfiles}
@@ -170,8 +170,8 @@ Returns true if the directory was successfully opened by a previous call to
 
 \func{bool}{Open}{\param{const wxString\& }{dir}}
 
-Open the directory for enumerating, returns true on success or false if an
-error occurred.
+Open the directory for enumerating, returns {\tt true} on success
+or {\tt false} if an error occurred.
 
 
 \membersection{wxDir::Traverse}\label{wxdirtraverse}

docs/latex/wx/event.tex

@@ -79,7 +79,7 @@ event, if any.
 
 \membersection{wxEvent::GetEventType}\label{wxeventgeteventtype}
 
-\func{WXTYPE}{GetEventType}{\void}
+\func{wxEventType}{GetEventType}{\void}
 
 Returns the identifier of the given event type,
 such as wxEVENT\_TYPE\_BUTTON\_COMMAND.
@@ -127,7 +127,7 @@ Sets the originating object.
 
 \membersection{wxEvent::SetEventType}\label{wxeventseteventtype}
 
-\func{void}{SetEventType}{\param{WXTYPE }{typ}}
+\func{void}{SetEventType}{\param{wxEventType }{type}}
 
 Sets the event type.
 

docs/latex/wx/filetype.tex

@@ -208,7 +208,7 @@ retrieved from \helpref{MessageParameters}{wxfiletypemessageparameters} class.
 
 This function is primarily intended for GetOpenCommand and GetPrintCommand
 usage but may be also used by the application directly if, for example, you want
-to use some non default command to open the file.
+to use some non-default command to open the file.
 
 The function replaces all occurrences of
 

docs/latex/wx/flexsizr.tex

@@ -9,8 +9,8 @@ the \helpref{wxGridSizer}{wxgridsizer}.
 Since wxWidgets 2.5.0, wxFlexGridSizer can also size items equally in one
 direction but unequally ("flexibly") in the other. If the sizer is only
 flexible in one direction (this can be changed using 
-\helpref{SetFlexibleDrection}{wxflexgridsizersetflexibledirection}),
-it needs to be decided how the sizer should grow in the other ("non flexible")
+\helpref{SetFlexibleDirection}{wxflexgridsizersetflexibledirection}),
+it needs to be decided how the sizer should grow in the other ("non-flexible")
 direction in order to fill the available space. The 
 \helpref{SetNonFlexibleGrowMode}{wxflexgridsizersetnonflexiblegrowmode} method
 serves this purpose.
@@ -84,14 +84,14 @@ One of the following values:
 
 \wxheading{See also}
 
-\helpref{SetFlexibleDrection}{wxflexgridsizersetflexibledirection}
+\helpref{SetFlexibleDirection}{wxflexgridsizersetflexibledirection}
 
 
 \membersection{wxFlexGridSizer::GetNonFlexibleGrowMode}\label{wxflexgridsizergetnonflexiblegrowmode}
 
 \constfunc{int}{GetNonFlexibleGrowMode}{\void}
 
-Returns the value that specifies how the sizer grows in the "non flexible"
+Returns the value that specifies how the sizer grows in the "non-flexible"
 direction if there is one.
 
 \wxheading{Return value}
@@ -99,20 +99,20 @@ direction if there is one.
 One of the following values:
 
 \begin{twocollist}
-\twocolitem{wxFLEX\_GROWMODE\_NONE}{Sizer doesn't grow in the non flexible direction.}
+\twocolitem{wxFLEX\_GROWMODE\_NONE}{Sizer doesn't grow in the non-flexible direction.}
 \twocolitem{wxFLEX\_GROWMODE\_SPECIFIED}{Sizer honors growable columns/rows set with
 \helpref{AddGrowableCol}{wxflexgridsizeraddgrowablecol} and 
 \helpref{AddGrowableRow}{wxflexgridsizeraddgrowablerow}.
 In this case equal sizing applies to minimum sizes of columns or
 rows (this is the default value).}
 \twocolitem{wxFLEX\_GROWMODE\_ALL}{Sizer equally stretches all columns or rows
-in the non flexible direction, whether they are growable or not in the flexible
+in the non-flexible direction, whether they are growable or not in the flexible
 direction.}
 \end{twocollist}
 
 \wxheading{See also}
 
-\helpref{SetFlexibleDrection}{wxflexgridsizersetflexibledirection}, 
+\helpref{SetFlexibleDirection}{wxflexgridsizersetflexibledirection}, 
 \helpref{SetNonFlexibleGrowMode}{wxflexgridsizersetnonflexiblegrowmode}
 
 
@@ -132,7 +132,7 @@ Specifies that row idx is no longer growable.
 
 \membersection{wxFlexGridSizer::SetFlexibleDirection}\label{wxflexgridsizersetflexibledirection}
 
-\func{void}{SetFlexibleDirections}{\param{int }{direction}}
+\func{void}{SetFlexibleDirection}{\param{int }{direction}}
 
 Specifies whether the sizer should flexibly resize its columns, rows, or
 both. Argument {\tt direction} can be {\tt wxVERTICAL}, {\tt wxHORIZONTAL} 
@@ -147,9 +147,9 @@ Note that this method does not trigger relayout.
 
 \func{void}{SetNonFlexibleGrowMode}{\param{wxFlexSizerGrowMode }{mode}}
 
-Specifies how the sizer should grow in the non flexible direction if
+Specifies how the sizer should grow in the non-flexible direction if
 there is one (so
-\helpref{SetFlexibleDirections()}{wxflexgridsizersetflexibledirection} must have
+\helpref{SetFlexibleDirection()}{wxflexgridsizersetflexibledirection} must have
 been called previously). Argument {\it mode} can be one of those documented in
 \helpref{GetNonFlexibleGrowMode}{wxflexgridsizergetnonflexiblegrowmode}, please
 see there for their explanation.

docs/latex/wx/function.tex

@@ -510,7 +510,7 @@ the corresponding functions \helpref{::wxPostEvent}{wxpostevent} and
 
 \wxheading{Include files}
 
-<wx/event.h>
+<wx/app.h>
 
 
 
@@ -737,7 +737,7 @@ See also \helpref{wxExecute}{wxexecute}, \helpref{Exec sample}{sampleexec}.
 
 This function shuts down or reboots the computer depending on the value of the
 {\it flags}. Please notice that doing this requires the corresponding access
-rights (superuser under Unix, {\tt SE\_SHUTDOWN} privelege under Windows NT)
+rights (superuser under Unix, {\tt SE\_SHUTDOWN} privilege under Windows NT)
 and that this function is only implemented under Unix and Win32.
 
 \wxheading{Parameters}
@@ -1175,7 +1175,7 @@ with wildcard characters. See \helpref{wxIsWild}{wxiswild}.
 Makes the directory \arg{dir}, returning true if successful.
 
 {\it perm} is the access mask for the directory for the systems on which it is
-supported (Unix) and doesn't have effect for the other ones.
+supported (Unix) and doesn't have any effect on the other ones.
 
 
 \membersection{::wxParseCommonDialogsFilter}\label{wxparsecommondialogsfilter}
@@ -3650,7 +3650,7 @@ Example:
 
 This macro is equivalent to {\tt wxDynamicCast(this, classname)} but the
 latter provokes spurious compilation warnings from some compilers (because it
-tests whether {\tt this} pointer is non {\tt NULL} which is always true), so
+tests whether {\tt this} pointer is non-{\tt NULL} which is always true), so
 this macro should be used to avoid them.
 
 \wxheading{See also}
@@ -4384,7 +4384,7 @@ This check is done even in release mode.
 Checks that the condition is true, returns with the given return value if not (FAILs in debug mode).
 This check is done even in release mode.
 
-This macro may be only used in non void functions, see also
+This macro may be only used in non-void functions, see also
 \helpref{wxCHECK\_RET}{wxcheckret}.
 
 

docs/latex/wx/hashmap.tex

@@ -3,7 +3,7 @@
 This is a simple, type-safe, and reasonably efficient hash map class,
 whose interface is a subset of the interface of STL containers. In
 particular, the interface is modeled after std::map, and the various,
-non standard, std::hash\_map.
+non-standard, std::hash\_map.
 
 \wxheading{Example}
 

docs/latex/wx/hashset.tex

@@ -3,7 +3,7 @@
 This is a simple, type-safe, and reasonably efficient hash set class,
 whose interface is a subset of the interface of STL containers. In
 particular, the interface is modeled after std::set, and the various,
-non standard, std::hash\_map.
+non-standard, std::hash\_map.
 
 \wxheading{Example}
 

docs/latex/wx/http.tex

@@ -31,8 +31,8 @@ Returns the HTTP response code returned by the server. Please refer to the RFC
 
 Creates a new input stream on the specified path. You can use all except the seek
 functionality of wxStream. Seek isn't available on all streams. For example,
-http or ftp streams doesn't deal with it. Other functions like Tell and SeekI
-for this sort of stream.
+HTTP or FTP streams don't deal with it. Other functions like Tell and SeekI
+aren't available for the moment for this sort of stream.
 You will be notified when the EOF is reached by an error.
 
 \wxheading{Note}

docs/latex/wx/htwindow.tex

@@ -207,7 +207,7 @@ hypertext link.
 \wxheading{Parameters}
 
 \docparam{cell}{The cell inside which the mouse was clicked, always a simple
-(i.e. non container) cell}
+(i.e. non-container) cell}
 
 \docparam{x, y}{The logical coordinates of the click point}
 
@@ -222,7 +222,7 @@ This method is called when a mouse moves over an HTML cell.
 \wxheading{Parameters}
 
 \docparam{cell}{The cell inside which the mouse is currently, always a simple
-(i.e. non container) cell}
+(i.e. non-container) cell}
 
 \docparam{x, y}{The logical coordinates of the click point}
 

docs/latex/wx/keyevent.tex

@@ -28,7 +28,7 @@ as well.
 Although in this simple case it is clear that the correct key code could be
 found in the key down event handler by checking the value returned by
 \helpref{ShiftDown()}{wxkeyeventshiftdown}, in general you should use
-{\tt EVT\_CHAR} for this as for non alphanumeric keys the translation is
+{\tt EVT\_CHAR} for this as for non-alphanumeric keys the translation is
 keyboard-layout dependent and can only be done properly by the system itself.
 
 Another kind of translation is done when the control key is pressed: for

docs/latex/wx/log.tex

@@ -215,7 +215,7 @@ Returns the pointer to the active log target (may be NULL).
 \func{static wxLog *}{SetActiveTarget}{\param{wxLog * }{ logtarget}}
 
 Sets the specified log target as the active one. Returns the pointer to the
-previous active log target (may be NULL).  To supress logging use a new
+previous active log target (may be NULL).  To suppress logging use a new
 instance of wxLogNull not NULL.  If the active log target is set to NULL a
 new default log target will be created when logging occurs.
 

docs/latex/wx/notebook.tex

@@ -199,7 +199,7 @@ The call to this function generates the page changing events.
 
 \constfunc{wxWindow *}{GetCurrentPage}{\void}
 
-Returns the currently selected notebook age or \texttt{NULL}.
+Returns the currently selected notebook page or \texttt{NULL}.
 
 
 \membersection{wxNotebook::GetImageList}\label{wxnotebookgetimagelist}
@@ -273,7 +273,7 @@ to {\tt SetBackgroundColour}. Otherwise, an uninitialised colour will be returne
 \func{int}{HitTest}{\param{const wxPoint\&}{ pt}, \param{long}{ *flags = {\tt NULL}}}
 
 Returns the index of the tab at the specified position or {\tt wxNOT\_FOUND}
-if none. If {\it flags} parameter is non {\tt NULL}, the position of the point
+if none. If {\it flags} parameter is non-{\tt NULL}, the position of the point
 inside the tab is returned as well.
 
 {\bf NB: } This method is currently only implemented under wxMSW and wxUniv.

docs/latex/wx/protocol.tex

@@ -34,8 +34,8 @@ true, if the connection is established, else false.
 \func{wxInputStream *}{GetInputStream}{\param{const wxString\&}{ path}}
 
 Creates a new input stream on the specified path. You can use all but seek
-functionality of wxStream. Seek isn't available on all stream. For example,
-http or ftp streams doesn't deal with it. Other functions like StreamSize and
+functionality of wxStream. Seek isn't available on all streams. For example,
+HTTP or FTP streams don't deal with it. Other functions like StreamSize and
 Tell aren't available for the moment for this sort of stream.
 You will be notified when the EOF is reached by an error.
 

docs/latex/wx/realpoin.tex

@@ -1,7 +1,7 @@
 \section{\class{wxRealPoint}}\label{wxrealpoint}
 
 A {\bf wxRealPoint} is a useful data structure for graphics operations.
-It contains floating point point {\it x} and {\it y} members.
+It contains floating point {\it x} and {\it y} members.
 See also \helpref{wxPoint}{wxpoint} for an integer version.
 
 \wxheading{Derived from}

docs/latex/wx/recguard.tex

@@ -12,7 +12,7 @@
 \section{\class{wxRecursionGuard}}\label{wxrecursionguard}
 
 wxRecursionGuard is a very simple class which can be used to prevent reentrancy
-problems in a function. It is not thread-safe and so should be used only in the
+problems in a function. It is not thread-safe and so should be used only in
 single-threaded programs or in combination with some thread synchronization
 mechanisms.
 

docs/latex/wx/rect.tex

@@ -235,7 +235,7 @@ boundary) and {\tt false} otherwise.
 
 \constfunc{bool}{Intersects}{\param{const wxRect\& }{rect}}
 
-Returns {\tt true} if this rectangle has a non empty intersection with the
+Returns {\tt true} if this rectangle has a non-empty intersection with the
 rectangle {\it rect} and {\tt false} otherwise.
 
 

docs/latex/wx/scrolwin.tex

@@ -19,7 +19,7 @@ calling either \helpref{wxWindow::SetVirtualSize}{wxwindowsetvirtualsize},
 or \helpref{wxWindow::FitInside}{wxwindowfitinside}, and setting the
 scrolling increments for it by calling 
 \helpref{wxScrolledWindow::SetScrollRate}{wxscrolledwindowsetscrollrate}.
-Scrolling in some orientation is enabled by setting a non zero increment
+Scrolling in some orientation is enabled by setting a non-zero increment
 for it.
 
 The most automatic and newest way is to simply let sizers determine the

docs/latex/wx/strtotxt.tex

@@ -62,7 +62,7 @@ the default parameter value to the text control {\it text}.
 
 \wxheading{Parameters}
 
-\docparam{text}{The text control to append output too, must be non NULL}
+\docparam{text}{The text control to append output too, must be non-NULL}
 
 \docparam{ostr}{The C++ stream to redirect, {\it cout} is used if it is NULL}
 

docs/latex/wx/taskbar.tex

@@ -75,7 +75,7 @@ This method is called by the library when the user requests popup menu
 (on Windows and Unix platforms, this is when the user right-clicks the icon).
 Override this function in order to provide popup menu associated with the icon.
 
-If CreatePopupIcon returns NULL (this happens by default),
+If CreatePopupMenu returns NULL (this happens by default),
 no menu is shown, otherwise the menu is
 displayed and then deleted by the library as soon as the user dismisses it.
 The events can be handled by a class derived from wxTaskBarIcon.
@@ -102,7 +102,7 @@ a class derived from wxTaskBarIcon.
 \wxheading{Note}
 
 It is recommended to override
-\helpref{CreatePopupIcon}{wxtaskbariconcreatepopupmenu}
+\helpref{CreatePopupMenu}{wxtaskbariconcreatepopupmenu}
 callback instead of calling this method from event handler, because some
 ports (e.g. wxCocoa) may not implement PopupMenu and mouse click events at all.
 

docs/latex/wx/text.tex

@@ -70,23 +70,6 @@ for a text control.
 \end{verbatim}
 }
 
-The values below are the possible return codes of the
-\helpref{HitTest}{wxtextctrlhittest} method:
-{\small
-\begin{verbatim}
-// the point asked is ...
-enum wxTextCtrlHitTestResult
-{
-    wxTE_HT_UNKNOWN = -2,   // this means HitTest() is simply not implemented
-    wxTE_HT_BEFORE,         // either to the left or upper
-    wxTE_HT_ON_TEXT,        // directly on
-    wxTE_HT_BELOW,          // below [the last line]
-    wxTE_HT_BEYOND          // after [the end of line]
-};
-// ... the character returned
-\end{verbatim}
-}
-
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
@@ -443,6 +426,25 @@ you may just do
 See \helpref{wxStreamToTextRedirector}{wxstreamtotextredirector} for more
 details.
 
+\wxheading{Constants}
+
+The values below are the possible return codes of the \helpref{HitTest}{wxtextctrlhittest} method:
+
+{\small
+\begin{verbatim}
+// the point asked is ...
+enum wxTextCtrlHitTestResult
+{
+    wxTE_HT_UNKNOWN = -2,   // this means HitTest() is simply not implemented
+    wxTE_HT_BEFORE,         // either to the left or upper
+    wxTE_HT_ON_TEXT,        // directly on
+    wxTE_HT_BELOW,          // below [the last line]
+    wxTE_HT_BEYOND          // after [the end of line]
+};
+// ... the character returned
+\end{verbatim}
+}
+
 \wxheading{Event handling}
 
 The following commands are processed by default event handlers in wxTextCtrl: wxID\_CUT, wxID\_COPY,

docs/latex/wx/tglbtn.tex

@@ -18,9 +18,6 @@ functionality but looks like a \helpref{wxButton}{wxbutton}.
 You can see wxToggleButton in action in the sixth page of the 
 \helpref{controls}{samplecontrols} sample.
 
-{\bf NB:} This class is not available under wxUniversal ports such
-as wxX11.
-
 \wxheading{Derived from}
 
 \helpref{wxControl}{wxcontrol}\\

docs/latex/wx/timer.tex

@@ -10,7 +10,7 @@ There are three different ways to use this class:
 \item You may derive a new class from wxTimer and override the 
 \helpref{Notify}{wxtimernotify} member to perform the required action.
 \item Or you may redirect the notifications to any 
-\helpref{wxEvtHandler}{wxevthandler} derived object by using the non default
+\helpref{wxEvtHandler}{wxevthandler} derived object by using the non-default
 constructor or \helpref{SetOwner}{wxtimersetowner}. Then use the {\tt EVT\_TIMER} 
 macro to connect it to the event handler which will receive 
 \helpref{wxTimerEvent}{wxtimerevent} notifications.

docs/latex/wx/tipwin.tex

@@ -30,7 +30,7 @@ Constructor. The tip is shown immediately the window is constructed.
 
 \wxheading{Parameters}
 
-\docparam{parent}{The parent window, must be non {\tt NULL}}
+\docparam{parent}{The parent window, must be non-{\tt NULL}}
 
 \docparam{text}{The text to show, may contain the new line characters}
 
@@ -38,7 +38,7 @@ Constructor. The tip is shown immediately the window is constructed.
 \helpref{SetTipWindowPtr}{wxtipwindowsettipwindowptr} below, please see its
 documentation for the description of this parameter}
 
-\docparam{rectBounds}{If non {\tt NULL}, passed to 
+\docparam{rectBounds}{If non-{\tt NULL}, passed to 
 \helpref{SetBoundingRect}{wxtipwindowsetboundingrect} below, please see its
 documentation for the description of this parameter}
 
@@ -61,7 +61,7 @@ By default, the tip window disappears when the user clicks the mouse or presses
 a keyboard key or if it loses focus in any other way - for example because the
 user switched to another application window.
 
-Additionally, if a non empty {\it rectBound} is provided, the tip window will
+Additionally, if a non-empty {\it rectBound} is provided, the tip window will
 also automatically close if the mouse leaves this area. This is useful to
 dismiss the tip mouse when the mouse leaves the object it is associated with.
 

docs/latex/wx/tlog.tex

@@ -13,7 +13,7 @@ Classes: \helpref{wxLog}{wxlog},\\
 
 This is a general overview of logging classes provided by wxWidgets. The word
 logging here has a broad sense, including all of the program output, not only
-non interactive messages. The logging facilities included in wxWidgets provide
+non-interactive messages. The logging facilities included in wxWidgets provide
 the base {\it wxLog} class which defines the standard interface for a {\it log
 target} as well as several standard implementations of it and a family of
 functions to use with them.

docs/latex/wx/treeevt.tex

@@ -62,7 +62,7 @@ Constructor.
 
 \constfunc{int}{GetKeyCode}{}
 
-Returns the key code if the event was is a key event. Use 
+Returns the key code if the event is a key event. Use 
 \helpref{GetKeyEvent}{wxtreeeventgetkeyevent} to get the values of the
 modifier keys for this event (i.e. Shift or Ctrl).
 
@@ -82,7 +82,7 @@ Returns the key event for {\tt EVT\_TREE\_KEY\_DOWN} events.
 
 \constfunc{const wxString\&}{GetLabel}{}
 
-Returns the label if the event was a begin or end edit label event.
+Returns the label if the event is a begin or end edit label event.
 
 \membersection{wxTreeEvent::GetOldItem}\label{wxtreeeventgetolditem}
 

docs/latex/wx/tthreads.tex

@@ -15,7 +15,7 @@ well.
 
 These classes will hopefully make writing MT programs easier and they also
 provide some extra error checking (compared to the native (be it Win32 or Posix)
-thread API), however it is still an non-trivial undertaking especially for large
+thread API), however it is still a non-trivial undertaking especially for large
 projects. Before starting an MT application (or starting to add MT features to
 an existing one) it is worth asking oneself if there is no easier and safer way
 to implement the same functionality. Of course, in some situations threads
@@ -41,7 +41,7 @@ itself and not by the other threads).
 For communication between secondary threads and the main thread, you may use 
 \helpref{wxEvtHandler::AddPendingEvent}{wxevthandleraddpendingevent}
 or its short version \helpref{wxPostEvent}{wxpostevent}. These functions
-have thread safe implementation so that they can be used as they are for
+have a thread-safe implementation so that they can be used as they are for
 sending events from one thread to another. However there is no built in method
 to send messages to the worker threads and you will need to use the available
 synchronization classes to implement the solution which suits your needs

docs/latex/wx/uri.tex

@@ -34,7 +34,7 @@ furthur functionality.
 
 \wxheading{Include files}
 
-<uri.h>
+<wx/uri.h>
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
@@ -350,7 +350,7 @@ of the base's is merged with this URI's path, resulting in the URI
 "http://mysite.com/john/mydir".
 
 \docparam{base}{Base URI to inherit from.  Must be a full URI and not a reference}
-\docparam{flags}{Currently either \texttt{wxURI\_STRICT} or $0$, in non strict
+\docparam{flags}{Currently either \texttt{wxURI\_STRICT} or $0$, in non-strict
 mode some compatibility layers are enabled to allow loopholes from RFCs prior
 to 2396}
 

docs/latex/wx/url.tex

@@ -81,8 +81,8 @@ It can be one of these errors:
 \func{wxInputStream *}{GetInputStream}{\void}
 
 Creates a new input stream on the specified URL. You can use all but seek
-functionality of wxStream. Seek isn't available on all stream. For example,
-http or ftp streams doesn't deal with it.
+functionality of wxStream. Seek isn't available on all streams. For example,
+HTTP or FTP streams don't deal with it.
 
 Note that this method is somewhat depreciated, all future wxWidgets applications
 should really use \helpref{wxFileSystem}{wxfilesystem} instead.

docs/latex/wx/window.tex

@@ -2337,7 +2337,7 @@ not delete) it from it.
 
 \wxheading{Parameters}
 
-\docparam{handler}{The event handler to remove, must be non {\tt NULL} and
+\docparam{handler}{The event handler to remove, must be non-{\tt NULL} and
 must be present in this windows event handlers chain}
 
 \wxheading{Return value}

docs/latex/wx/wizpage.tex

@@ -63,7 +63,7 @@ wizard will resize and reposition the page anyhow.
 
 \docparam{bitmap}{The page-specific bitmap if different from the global one}
 
-\docparam{resource}{Load the page from the specified resource if non NULL}
+\docparam{resource}{Load the page from the specified resource if non-NULL}
 
 \membersection{wxWizardPage::GetPrev}\label{wxwizardpagegetprev}
 

docs/latex/wx/xmlres.tex

@@ -72,7 +72,8 @@ Initializes only a specific handler (or custom handler). Convention says
 that the handler name is equal to the control's name plus 'XmlHandler', for example
 wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource compiler
 (wxxrc) can create include file that contains initialization code for
-all controls used within the resource.
+all controls used within the resource. Note that this handler should be
+located on heap instead of stack, since it will get destroyed on shutdown.
 
 
 \membersection{wxXmlResource::AttachUnknownControl}\label{wxxmlresourceattachunknowncontrol}

docs/mgl/install.txt

@@ -1,5 +1,5 @@
-wxWidgets 2.6.3 for MGL installation
-------------------------------------
+wxWidgets for MGL installation
+------------------------------
 
 IMPORTANT NOTE:
 
@@ -170,16 +170,16 @@ configure, you only have to specify the target:
 > ./configure --with-mgl --build=i586-linux --host=i586-pc-msdosdjgpp
 > make
 
-For this to work, you must have installed a cross compiler on your system. Ready
-made binaries are not available for very many systems, so usually this means you
-must obtain the djgpp sources and compile them yourself.
+For this to work, you must have installed a cross compiler on your system.
 
-NetBSD does have a binary package which can be installed with:
+Linux rpms are available here:
+    http://ap1.pp.fi/djgpp/gcc/cross-compiler/index.html
+
+NetBSD has a binary package which can be installed with:
     # pkg_add cross-i386-msdosdjgpp
 
-You can also try asking on the wx-dev mailing list. If someone else has already
-built a cross-compiler for you platform they may be willing to send you the
-binaries.
+For other systems you will need to obtain the djgpp sources and compile them
+yourself.
 
 
 * Building wxMGL for MS-DOS using Watcom C/C++

docs/publicity/announce.txt

@@ -1,22 +1,20 @@
-Announcing wxWidgets 2.6.1: a cross-platform GUI toolkit
+Announcing wxWidgets 2.6.3: a cross-platform GUI toolkit
 ----------------------------------------------------------------
 
-June 5th, 2005 -- the wxWidgets team is pleased to announce
-a new official release of the mature cross-platform C++
-application framework.
+March 27th, 2006 -- the wxWidgets team is pleased to announce a new
+official release of the mature cross-platform C++ application framework.
 
 The following platforms are supported:
 
-- Windows 95/98/ME, Windows NT, Windows 2000, Windows XP
-- Windows CE, including Pocket PC 2003 and Smartphone 2003
+- Windows 95/98/ME/NT/2000/XP/Vista
+- Windows CE, including Pocket PC/Smartphone 2003, Mobile 5.0
 - Linux/Unix/VMS with GTK+ 1.x and 2.0
-- Linux/Unix with X11 (beta)
+- Linux/Unix with X11
 - Linux/Unix with Motif/Lesstif
+- MGL for Linux and DOS
 - Mac OS 9.x and 10.2 and above using Carbon
 - Mac OS 10.x using Cocoa (beta)
 - OS/2 (beta)
-- MGL for Linux and DOS
-- Palm OS (alpha)
 
 A non-GUI subset of wxWidgets called wxBase is also supported
 on most of these platforms.
@@ -25,67 +23,49 @@ To get wxWidgets, go to the Download page at:
 
   http://www.wxwidgets.org
 
-Since 2.4.2, we have added support for Windows Mobile devices,
-enhanced GTK+ 2 support, radically overhauled the Mac OS X port,
-replaced the build system with Bakefile, added better
-integration with STL, and added a CppUnit-based test suite.
-Other changes include sizer improvements, new Gnome printing
-features, ODBC enhancements such as BLOB support and Unicode
-support on Windows, wxTaskBarIcon support on Mac OS X and Linux
-as well as Windows, top-level windows can have arbitrary shapes,
-images can have alpha channels, plus many API enhancements and
-bug fixes to existing classes. New classes include
-wxVScrolledWindow, wxVListBox, wxHtmlListbox,
-wxPropertySheetDialog, wxGridBagSizer, wxMediaCtrl,
-wxDatePickerCtrl, wxArchiveInputStream/wxArchiveOutputStream
-(including zip archive read/write support), wxListbook,
-wxChoicebook, wxDebugReport, and more.
+This is primarily a bug fix release. Notable improvements include
+Mac universal binary creation with the command-line tools,
+Windows Mobile 5.0 support, context menu and enhanced file selector
+support on Windows CE, AMD 64-bit compilation on Windows, better
+VC++ 2005 support, and more efficient paint handling on GTK+.
 
 *** About wxWidgets
 
 wxWidgets is a comprehensive open-source, multi-platform C++ GUI
-framework, that can be used to build commercial and free
-software. First released in 1992 under the name wxWindows, it's
-increasingly used by organisations and individuals all over the
-world due to its winning combination of sophistication, wide
-platform coverage, ease of use, unrestrictive licence and
-vibrant user community.
+framework, that can be used to build commercial and free software.
+First released in 1992 under the name wxWindows, it's increasingly
+used by organisations and individuals all over the world due to its
+winning combination of sophistication, wide platform coverage, ease
+of use, unrestrictive licence and vibrant user community.
 
-For most ports, wxWidgets adopts the native look and feel of
-each platform since it uses the native widget sets. There is also
-a generic widget set, used for example by the wxX11 port - no
-other widget set is required, giving the potential for embedded
-use.
+For most ports, wxWidgets adopts the native look and feel of each
+platform since it uses the native widget sets. There is also a generic
+widget set, used for example by the wxX11 port - no other widget set
+is required, giving the potential for embedded use.
 
-An extraordinary range of classes is provided - but don't be put
-off by this because most people find wxWidgets easier to learn
-and use than MFC and other frameworks.
+An extraordinary range of classes is provided - but don't be put off
+by this because most people find wxWidgets easier to learn and use than
+MFC and other frameworks.
 
 As well as comprehensive support for the usual widgets, advanced
 features include: HTML viewing/printing, wxImage class providing
 handlers for reading and writing many image types, resizeable panels
 and dialogs on all platforms, document/view, OpenGL support,
-HTML-based and context-sensitive help, wizards, drag and drop,
-a grid class, ODBC support, threads, sockets, container classes,
-a styled text control, and much more. A 2,000-page reference manual
-is provided in HTML, MS HTML Help, WinHelp, wxWidgets Help and PDF
-formats, and there are over eighty samples and demos.
+HTML-based and context-sensitive help, wizards, drag and drop, a grid
+class, ODBC support, threads, sockets, container classes, a styled text
+control, and much more. A 2,000-page reference manual is provided in
+HTML, MS HTML Help, WinHelp, wxWidgets Help and PDF formats, and there
+are over eighty samples and demos.
 
-If you're an MFC user, you'll find many wxWidgets concepts
-reassuringly familiar, while often clearer and more consistent.
-If you're not, you should still find it intuitive from the start.
+If you're an MFC user, you'll find many wxWidgets concepts reassuringly
+familiar, while often clearer and more consistent. If you're not, you
+should still find it intuitive from the start.
 
-wxWidgets bindings for several other languages are available,
-including Python, Perl, Basic, Lua, JavaScript and Eiffel.
-
-If you're considering wxWidgets, do check out some of these links:
-
-    http://www.wxwidgets.org/feedback.htm ; Comments from users
-    http://www.wxwidgets.org/screensh.htm ; Screenshots
-    http://www.wxwidgets.org/users.htm    ; A list of some of our
-                                          ; users
+wxWidgets bindings for several other languages are available, including
+Python, Perl, Basic, Lua, JavaScript and Eiffel.
 
 Have fun!
 
 The wxWidgets team
+March, 2006
 

docs/publicity/publicity.txt

@@ -73,8 +73,16 @@ http://sal.kachinatech.com/index.shtml: SAL (Scientific Applications on Linux)
 
 MacDev developers list
 
-To submit a posting to MacDev-1, mailto:press_releases@mactech.com.  To
-subscribe to MacDev-1, send mail to listserv@listmail.xplain.com with
+To submit a posting to MacDev-1, mailto:press_releases@mactech.com.
+Also supply:
+- Your name
+- Your title
+- Your email
+- Your company
+- Your physical address (e.g., street, city, state, zip/postal code, country)
+- Your phone and fax
+
+To subscribe to MacDev-1, send mail to listserv@listmail.xplain.com with
 the SUBJECT line reading "SUBSCRIBE MACDEV-1".  To unsubscribe, the
 SUBJECT line should read "UNSUBSCRIBE MACDEV-1".
 
@@ -148,3 +156,24 @@ http://www.egovos.org/ The Center of Open Source & Government
 http://www.opensector.org/
 (nothing submitted yet)
 
+=== Submitted for 2.6.3
+
+Subject:
+ANN: wxWidgets 2.6.3 GUI toolkit
+
+comp.os.linux.development.apps
+
+comp.os.ms-windows.programmer.misc
+comp.os.ms-windows.programmer.tools
+comp.os.ms-windows.programmer.tools.mfc
+comp.os.ms-windows.programmer.tools.misc
+comp.os.ms-windows.programmer.win32
+microsoft.public.win32.programmer.tools
+microsoft.public.win32.programmer.ui
+microsoft.public.win32.programmer.3rdparty
+microsoft.public.win32.programmer.wince
+microsoft.public.pocketpc.developer
+microsoft.public.smartphone.developer
+
+comp.sys.mac.programmer.tools
+

include/wx/control.h

@@ -66,6 +66,7 @@ public:
     virtual void SetLabel( const wxString &label );
     virtual bool SetFont(const wxFont& font);
 
+#if WX_USE_RESERVED_VIRTUALS
     // Reserved for future use
     virtual void ReservedControlFunc1() {}
     virtual void ReservedControlFunc2() {}
@@ -76,6 +77,7 @@ public:
     virtual void ReservedControlFunc7() {}
     virtual void ReservedControlFunc8() {}
     virtual void ReservedControlFunc9() {}
+#endif
 
 protected:
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it

include/wx/dc.h

@@ -631,6 +631,7 @@ public:
         if (h) *h = hh;
     }
 
+#if WX_USE_RESERVED_VIRTUALS
     // Reserved for future use
     virtual void ReservedDCFunc1() {}
     virtual void ReservedDCFunc2() {}
@@ -641,6 +642,7 @@ public:
     virtual void ReservedDCFunc7() {}
     virtual void ReservedDCFunc8() {}
     virtual void ReservedDCFunc9() {}
+#endif
 
 protected:
     // the pure virtual functions which should be implemented by wxDC

include/wx/defs.h

@@ -78,6 +78,12 @@
 #   pragma warning(disable:4305)    /*  truncation of long to near ptr */
 #endif
 
+    /* For VC++ 5.0 for release mode, the warning 'C4702: unreachable code */
+    /* is buggy, and occurs for code that does actually get executed */
+#   if !defined __WXDEBUG__ && __VISUALC__ <= 1100
+#       pragma warning(disable:4702)    /* unreachable code */ 
+#   endif
+
 /* Deprecated functions such as sprintf, localtime */
 #if __VISUALC__ >= 1400
 #define _CRT_SECURE_NO_DEPRECATE 1

include/wx/dlimpexp.h

@@ -77,6 +77,7 @@
 #    define WXMAKINGDLL_NET
 #    define WXMAKINGDLL_CORE
 #    define WXMAKINGDLL_ADV
+#    define WXMAKINGDLL_QA
 #    define WXMAKINGDLL_ODBC
 #    define WXMAKINGDLL_DBGRID
 #    define WXMAKINGDLL_HTML

include/wx/generic/fontdlgg.h

@@ -52,6 +52,10 @@ class WXDLLEXPORT wxGenericFontDialog : public wxFontDialogBase
 {
 public:
     wxGenericFontDialog() { Init(); }
+#if wxABI_VERSION >= 20604
+    wxGenericFontDialog(wxWindow *parent)
+        : wxFontDialogBase(parent) { Init(); }
+#endif
     wxGenericFontDialog(wxWindow *parent, const wxFontData& data)
         : wxFontDialogBase(parent, data) { Init(); }
     virtual ~wxGenericFontDialog();

include/wx/generic/grid.h

@@ -105,7 +105,7 @@ public:
     // calling DecRef() once will delete it. Calling IncRef() allows to lock
     // it until the matching DecRef() is called
     void IncRef() { m_nRef++; }
-    void DecRef() { if ( !--m_nRef ) delete this; }
+    void DecRef() { if ( --m_nRef == 0 ) delete this; }
 
     // interpret renderer parameters: arbitrary string whose interpretatin is
     // left to the derived classes
@@ -660,7 +660,7 @@ public:
     // calling DecRef() once will delete it. Calling IncRef() allows to lock
     // it until the matching DecRef() is called
     void IncRef() { m_nRef++; }
-    void DecRef() { if ( !--m_nRef ) delete this; }
+    void DecRef() { if ( --m_nRef == 0 ) delete this; }
 
     // setters
     void SetTextColour(const wxColour& colText) { m_colText = colText; }

include/wx/gtk/scrolwin.h

@@ -154,17 +154,9 @@ public:
     void OnPaint(wxPaintEvent& event);
     void OnChar(wxKeyEvent& event);
 
-    void GtkVScroll( float value, unsigned int scroll_type );
-    void GtkHScroll( float value, unsigned int scroll_type );
-    void GtkVConnectEvent();
-    void GtkHConnectEvent();
-    void GtkVDisconnectEvent();
-    void GtkHDisconnectEvent();
-
     // Calculate scroll increment
     virtual int CalcScrollInc(wxScrollWinEvent& event);
 
-    // Overridden from wxWidgets due callback being static
     virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
 
 #if WXWIN_COMPATIBILITY_2_2
@@ -192,6 +184,13 @@ protected:
     double                m_scaleY,m_scaleX;
 
 private:
+    void DoScroll(int orient, int pos, int* posOld, int pixelsPerLine);
+    void DoAdjustScrollbars(GtkAdjustment* adj,
+                            int pixelsPerLine,
+                            int winSize,
+                            int virtSize,
+                            int *linesPerPage);
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxScrolledWindow)
 };

include/wx/gtk/window.h

@@ -276,6 +276,8 @@ public:
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
 
+    void HandleScrollEvent(GtkAdjustment* adj);
+
 protected:
     // common part of all ctors (not virtual because called from ctor)
     void Init();

include/wx/list.h

@@ -178,7 +178,9 @@ private:
             const compatibility_iterator* operator->() const { return this; } \
                                                                               \
             bool operator==(const compatibility_iterator& i) const            \
-                { return (m_list == i.m_list) && (m_iter == i.m_iter); }      \
+                { return (m_list == i.m_list) && (m_iter == i.m_iter)         \
+                  || !m_list && (i.m_iter == i.m_list->end())                 \
+                  || !i.m_list && (m_iter == m_list->end()); }                \
             bool operator!=(const compatibility_iterator& i) const            \
                 { return !( operator==( i ) ); }                              \
             operator bool() const                                             \
@@ -199,7 +201,8 @@ private:
             compatibility_iterator GetPrevious() const                        \
             {                                                                 \
                 iterator i = m_iter;                                          \
-                return compatibility_iterator( m_list, --i );                 \
+                i != m_list->begin() ? --i : i = m_list->end();               \
+                return compatibility_iterator( m_list, i );                   \
             }                                                                 \
             int IndexOf() const                                               \
             {                                                                 \

include/wx/mac/carbon/config_xcode.h

@@ -87,7 +87,6 @@
 #if __BIG_ENDIAN__
 #define WORDS_BIGENDIAN 1
 #endif
-#define WXWIN_COMPATIBILITY_2_4 1
 #define WXWIN_OS_DESCRIPTION "Darwin 7.3.0 Power Macintosh"
 #define WX_GMTOFF_IN_TM 1
 #define WX_NO_REGEX_ADVANCED 1

include/wx/mac/carbon/dataform.h

@@ -53,7 +53,8 @@ public:
     void SetType( wxDataFormatId type );
 
     // returns true if the format is one of those defined in wxDataFormatId
-    bool IsStandard() const { return m_format > 0 && m_format < wxDF_PRIVATE; }
+    bool IsStandard() const { return m_type > 0 && m_type < wxDF_PRIVATE; }
+    
 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;

include/wx/mac/carbon/dcprint.h

@@ -36,6 +36,7 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;
     wxPrintData& GetPrintData() { return m_printData; }
+    virtual wxSize GetPPI() const;
     virtual void DoGetSize( int *width, int *height ) const;
 #if wxMAC_USE_CORE_GRAPHICS
     void MacSetCGContext( void * cg ) ;

include/wx/mac/setup0.h

@@ -46,6 +46,14 @@
 // Recommended setting: 0 (please update your code)
 #define WXWIN_COMPATIBILITY_2_4 1
 
+// This setting controls the inclusion of reserved virtual functions
+// that were introduced just prior to the 2.6 freeze but have been
+// removed again for 2.7+
+//
+// Default is 1, typically you should not change it unless you know
+// exactly why you don't want them included.
+#define WX_USE_RESERVED_VIRTUALS 1
+
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of
 // the current font.

include/wx/metafile.h

@@ -28,16 +28,19 @@
         #if defined(__WXPALMOS__)
             #include "wx/palmos/enhmeta.h"
         #else
-        #include "wx/msw/enhmeta.h"
+            #include "wx/msw/enhmeta.h"
         #endif
 
-        // map all metafile classes to enh metafile
-        #if !wxUSE_WIN_METAFILES_ALWAYS
+        #if wxUSE_WIN_METAFILES_ALWAYS
+            // use normal metafiles as well
+            #include "wx/msw/metafile.h"
+        #else // also map all metafile classes to enh metafile
             typedef wxEnhMetaFile wxMetafile;
             typedef wxEnhMetaFileDC wxMetafileDC;
-#if wxUSE_DRAG_AND_DROP
-            typedef wxEnhMetaFileDataObject wxMetafileDataObject;
-#endif
+            #if wxUSE_DRAG_AND_DROP
+                typedef wxEnhMetaFileDataObject wxMetafileDataObject;
+            #endif
+
             // this flag will be set if wxMetafile class is wxEnhMetaFile
             #define wxMETAFILE_IS_ENH
         #endif // wxUSE_WIN_METAFILES_ALWAYS
@@ -45,8 +48,8 @@
         #if defined(__WXPALMOS__)
             #include "wx/palmos/metafile.h"
         #else
-        #include "wx/msw/metafile.h"
-    #endif
+            #include "wx/msw/metafile.h"
+        #endif
     #endif
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
@@ -55,5 +58,5 @@
 #endif
 
 #endif // wxUSE_METAFILE
-#endif
-    // _WX_METAFILE_H_BASE_
+
+#endif // _WX_METAFILE_H_BASE_

include/wx/msw/combobox.h

@@ -79,7 +79,7 @@ public:
     // List functions: see wxChoice
 
     // Text field functions
-    wxString GetValue() const { return m_value; }
+    wxString GetValue() const; 
     virtual void SetValue(const wxString& value);
 
     // Clipboard operations
@@ -100,7 +100,7 @@ public:
     virtual int GetSelection() const;
     virtual void GetSelection(long* from, long* to) const;
     virtual void SetEditable(bool editable);
-    virtual void Clear() { wxChoice::Clear(); m_selectionOld = -1; }
+    virtual void Clear() { wxChoice::Clear(); }
 
     virtual void Undo() ;
     virtual void Redo() ;
@@ -138,8 +138,7 @@ protected:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // common part of all ctors
-    void Init() { m_selectionOld = -1; }
-
+    void Init() { }
 
     // the previous selection (see MSWCommand() to see why it is needed)
     int m_selectionOld;

include/wx/msw/mslu.h

@@ -56,7 +56,8 @@ WXDLLIMPEXP_BASE FILE* wxMSLU__tfopen(const wxChar *name, const wxChar *mode);
 #if defined( __VISUALC__ ) \
     || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
     || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
-    || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) )
+    || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) ) \
+    || defined(__DMC__)
 
 #ifdef __BORLANDC__
     // BCC has _stati64() function but struct stati64

include/wx/msw/private.h

@@ -192,6 +192,22 @@ protected:
     HANDLE m_handle;
 };
 
+// a template to make initializing Windows styructs less painful: it zeroes all
+// the struct fields and also sets cbSize member to the correct value (and so
+// can be only used with structures which have this member...)
+template <class T>
+struct WinStruct : public T
+{
+    WinStruct()
+    {
+        ::ZeroMemory(this, sizeof(T));
+
+        // explicit qualification is required here for this to be valid C++
+        this->cbSize = sizeof(T);
+    }
+};
+
+
 #if wxUSE_GUI
 
 #include <wx/gdicmn.h>
@@ -342,22 +358,6 @@ inline RECT wxGetClientRect(HWND hwnd)
 // small helper classes
 // ---------------------------------------------------------------------------
 
-// a template to make initializing Windows styructs less painful: it zeroes all
-// the struct fields and also sets cbSize member to the correct value (and so
-// can be only used with structures which have this member...)
-template <class T>
-struct WinStruct : public T
-{
-    WinStruct()
-    {
-        ::ZeroMemory(this, sizeof(T));
-
-        // explicit qualification is required here for this to be valid C++
-        this->cbSize = sizeof(T);
-    }
-};
-
-
 // create an instance of this class and use it as the HDC for screen, will
 // automatically release the DC going out of scope
 class ScreenHDC

include/wx/msw/setup0.h

@@ -45,6 +45,14 @@
 // Recommended setting: 0 (please update your code)
 #define WXWIN_COMPATIBILITY_2_4 1
 
+// This setting controls the inclusion of reserved virtual functions
+// that were introduced just prior to the 2.6 freeze but have been
+// removed again for 2.7+
+//
+// Default is 1, typically you should not change it unless you know
+// exactly why you don't want them included.
+#define WX_USE_RESERVED_VIRTUALS 1
+
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of
 // the current font.

include/wx/msw/wince/setup.h

@@ -45,6 +45,14 @@
 // Recommended setting: 0 (please update your code)
 #define WXWIN_COMPATIBILITY_2_4 1
 
+// This setting controls the inclusion of reserved virtual functions
+// that were introduced just prior to the 2.6 freeze but have been
+// removed again for 2.7+
+//
+// Default is 1, typically you should not change it unless you know
+// exactly why you don't want them included.
+#define WX_USE_RESERVED_VIRTUALS 1
+
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of
 // the current font.
@@ -120,7 +128,7 @@
 // Default is 1
 //
 // Recommended setting: 1 if your compiler supports it.
-#define wxUSE_ON_FATAL_EXCEPTION 0
+#define wxUSE_ON_FATAL_EXCEPTION 1
 
 // Set this to 1 to be able to generate a human-readable (unlike
 // machine-readable minidump created by wxCrashReport::Generate()) stack back
@@ -129,7 +137,7 @@
 // Default is 1 if supported by the compiler.
 //
 // Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_STACKWALKER 0
+#define wxUSE_STACKWALKER 1
 
 // Set this to 1 to compile in wxDebugReport class which allows you to create
 // and optionally upload to your web site a debug report consisting of back
@@ -139,7 +147,7 @@
 //
 // Recommended setting: 1, it is compiled into a separate library so there
 //                         is no overhead if you don't use it
-#define wxUSE_DEBUGREPORT 0
+#define wxUSE_DEBUGREPORT 1
 
 // ----------------------------------------------------------------------------
 // Unicode support
@@ -188,7 +196,7 @@
 //
 // Recommended setting: depends on whether you intend to use C++ exceptions
 //                      in your own code (1 if you do, 0 if you don't)
-#define wxUSE_EXCEPTIONS    0
+#define wxUSE_EXCEPTIONS    1
 
 // Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
 //
@@ -472,20 +480,6 @@
 // Recommended setting: 1 
 #define wxUSE_MEDIACTRL     1
 
-// Use QuickTime
-//
-// Default is 0
-//
-// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
-#define wxUSE_QUICKTIME     0
-
-// Use DirectShow (requires linkage to strmiids.lib)
-//
-// Default is 0
-//
-// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
-#define wxUSE_DIRECTSHOW    0
-
 // Use GStreamer for Unix (req a lot of dependancies)
 //
 // Default is 0
@@ -922,11 +916,11 @@
                                 // 0 for no interprocess comms
 #define wxUSE_HELP        1
                                 // 0 for no help facility
-#define wxUSE_MS_HTML_HELP 0
+#define wxUSE_MS_HTML_HELP 1
                                 // 0 for no MS HTML Help
 
 // Use wxHTML-based help controller?
-#define wxUSE_WXHTML_HELP 0
+#define wxUSE_WXHTML_HELP 1
 
 #define wxUSE_RESOURCES   0
                                 // 0 for no wxGetResource/wxWriteResource

include/wx/msw/window.h

@@ -521,12 +521,14 @@ private:
     // current defer window position operation handle (may be NULL)
     WXHANDLE m_hDWP;
 
+protected:
     // When deferred positioning is done these hold the pending changes, and
     // are used for the default values if another size/pos changes is done on
     // this window before the group of deferred changes is completed.
     wxPoint     m_pendingPosition;
     wxSize      m_pendingSize;
 
+private:
 #ifdef __POCKETPC__
     bool        m_contextMenuEnabled;
 #endif

include/wx/msw/wx.rc

@@ -77,6 +77,10 @@ wxICON_SMALL_CDROM              ICON "wx/msw/cdrom.ico"
 wxICON_SMALL_FLOPPY             ICON "wx/msw/floppy.ico"
 wxICON_SMALL_REMOVEABLE         ICON "wx/msw/removble.ico"
 
+// Low alphabetically to make it the default, but not so low as to
+// affect applications that use 'a'
+bICON                           ICON "wx/msw/std.ico"
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // Bitmaps