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

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

debian/changelog

@@ -1,7 +1,5 @@
-wxwindows2.2 (2.2.5.1) unstable; urgency=low
+wxwindows2.2 (2.2.5) unstable; urgency=low
 
-  * "This One's for Dirk"  Closes: #84696
-  * 2.2.5 has known issues and will not be released for Debian.
   * Fixed parser.y for Alpha builds (#82949)
   * changed mesa dependency to the virtual libgl package and
     added Conflicts for the old 2.1 packages (which are now

debian/control.in

@@ -1,7 +1,7 @@
 Source: wxwindows=V
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>=2.0), flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), python-distutils, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
+Build-Depends: debhelper (>=1.1.17), flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), python-distutils, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
 Maintainer: Ron Lee <ron@debian.org>
 Standards-Version: 3.2.1.2
 

debian/rules

@@ -430,7 +430,7 @@ install-examples: build-examples-stamp
 	dh_installdirs
 
 binary-common:
-	dh_testversion 2
+	dh_testversion 1.1.17
 	dh_testdir
 	dh_testroot
 	dh_installdocs

docs/changes.txt

@@ -13,14 +13,6 @@ wxMSW:
 OTHER CHANGES
 -------------
 
-2.2.6
------
-
-wxMSW:
-
-- wxChoice sizing bug introduced in 2.2.5 fixed (oops) and calculating of
-  the size of initially empty wxChoice controls fixed as well
-
 2.2.5
 -----
 

docs/gtk/changes.txt

@@ -2,11 +2,7 @@ This file contains the detailed log of wxGTK-specific changes, please see
 doc/changes.txt for the concise log of important changes in all wxWindows
 ports.
 
-*** next release ***
 
-wxWakeUpIdle() works again
-
-wxGauge now supports wxGA_VERTICAL (Shane Forsythe)
 
 *** 29th January 2001: wxWindows 2.2.5 released ***
 
@@ -22,7 +18,7 @@ with older egcs.
 
 Corrected wxYield() to handle recursive calls
 more gracefully (and with a warning in debug mode).
-This fixes a problem with crashing wxTreeCtrl's
+This fixes a problem with crashing wxTreeCtrl's 
 built-in drag'n'drop and probably some other as
 well.
 
@@ -135,28 +131,28 @@ Added code for writing BMP images.
 Added code for writing TIFF images.
 
 Fixed problem with best visuals (on SGI)
-
+   
 Applied a number of compile fixes for various Unix variants.
 
 Fixed wrong background colours appearing sometimes and fix
 for resetting the default font in controls.
-
+   
 Speed-up to wxListCtrl.
 
 Fixed bug wxTextStream::ReadLine()
-
+   
 Various improvements commandline parser.
-
+ 
 Changed wxColour unequal operator to compare colours.
-
+   
 Fixed wxMenuBar::Replace bug.
 
 Added new position to slider update event.
-
+   
 Minor fix to idle handling (now wxGTK events come after all GTK events).
 
 Various fixes to the new wxGrid class.
-
+   
 Bug-fixes.
 
 *** 4th June 2000: wxWindows pre-2.2 release ***
@@ -179,7 +175,7 @@ An extra library for the OpenGl class now gets builts
 *** 19th March 2000: wxWindows 2.1.14 released ***
 
 An extra library for the OpenGl class now gets builts
-and installed. There is also an extra RPM for this
+and installed. There is also an extra RPM for this 
 small class now.
 
 Added possibility to compile wxGTK with already installed
@@ -284,7 +280,7 @@ Build-fixes for various platforms and compilers.
 
 *** 6th January '2000: wxWindows 2.1.12 released ***
 
-Who has a BigEndian computer (e.g. Sparc or PowerPC) that runs a 15
+Who has a BigEndian computer (e.g. Sparc or PowerPC) that runs a 15 
 and/or 16 bit colour mode? I need this for testing purposes, i.e. this
 person could help me by running a small testprogram and sending
 me the output.
@@ -373,7 +369,7 @@ Fixed several problems with buffered streams. Added support for
 setting the end-of-line mode (Mac,DOS,Unix) in wxTextOutputStream.
 
 Added code to send events from one thread to another and added
-function to wake up idle system (needed for sending inter-thread
+function to wake up idle system (needed for sending inter-thread 
 events).
 
 Corrected wrongly set flag in dialogs which broke its tab code.
@@ -407,8 +403,8 @@ release will be called wxWindows 2.2.X, development snapshots
 will be called 2.1.X.
 
 A lot of discussion has been wasted on how to maintain a
-once released stable version. It was almost universally
+once released stable version. It was almost universally 
-agreed that only a commercial entity will have the motivation
+agreed that only a commercial entity will have the motivation 
 ($$$) to do that - so far there is no wxWindows Inc.
 
 Support for GTK 1.0 has been dropped. This version has
@@ -419,8 +415,8 @@ Rewritten the support for multiple-format Drag'n'Drop and
 clipboard under both GTK and MSW. There are probably some
 problems here and there left.
 
-wxListBox and wxChoice can now handle only either void
+wxListBox and wxChoice can now handle only either void 
-client data (which it will not delete on destruction) or
+client data (which it will not delete on destruction) or 
 client data of the wxClientData type (which it will delete),
 instead of both at the same time. The same will happen
 to wxComboBox some time. Also, wxListBox can now sort its
@@ -514,7 +510,7 @@ Made default button action work in more cases.
 
 As the old makefile system didn't work, I trashed it and wrote
 a new one - mo more GNU. This, of course, caused a lot of people
-to start sing their song of complaints - any change is a good
+to start sing their song of complaints - any change is a good 
 opportunity to complain, but the effect of the change is that
 we now have shared library support on Linux and Solaris (and
 probably others as well) and that the Linux shared library no
@@ -577,7 +573,7 @@ A few more minor fixes.
 
 6th August '99: Eight wxGTK 2.1 snapshot released
 
-The new makefile system is not able to produce shared libraries
+The new makefile system is not able to produce shared libraries 
 on Unix with the exception of Linux - libtool is really great.
 Therefore, the build system defaults to static libraries on
 anything but Linux for now.
@@ -640,8 +636,8 @@ Some more corrections I forgot.
 New wxPython (includes new layout system and printing).
 
 15th June '99: Sixth wxGTK 2.1 snapshot released
-
+  
-
+ 
 The biggest change is the completely rewritten configure/makefile
 system using automake. The main argument for switching to automake
 is that the resulting makefiles should be more portable so that
@@ -651,69 +647,69 @@ shared-only compilation, can be invoked from any directory for
 concurrent builds wihtin one source tree, uses libtool for greater
 shared-library platform support, has a functinonal "make uninstall",
 works with GTK, Motif and WINE, conforms better to GNU standards
-as far as configure option names are concerned and is easier to
+as far as configure option names are concerned and is easier to 
 maintain.
-
+ 
 Applied patches to compile wxGTK on OS/2.
-
+ 
 Configure checks for byte-order and new defines for byte swapping
 with respect to the byte-order. Added test for this to typetest sample.
-Also made BMP handler bigendian safe so that it should work on
+Also made BMP handler bigendian safe so that it should work on 
-Solaris and such.
+Solaris and such. 
-
+ 
-Small changes to basic drawing stuff: made wxColour actually compare
+Small changes to basic drawing stuff: made wxColour actually compare 
 RGB values in the == operator, added new constructor to wxMask,
 corrected initial background colour for DCs, it is now possible
 to use a wxWindowDC etc before there is any window (this doesn't
 make any sense, but it is what wxMSW does.)
-
+ 
 Added support for the PRIMARY SELECTION to the wxClipboard
 class.
-
+ 
 Fixed redraw bug when scrolling window-less widgets out
 of the visible area (actually a work-around for a GTK bug).
-
+ 
 Regrouped some samples, created new one for various versions
 of the wxTextCtrl.
-
+ 
 Added wxWindow::Reparent() and wxFrame::MakeModal().
-
+ 
 Improved handling of column width in wxListCtrl and made
 this more compatible with the wxMSW version. Also removed
 a bug from the wxImageList returning an off-by-one id for
 added images.
-
+ 
 Fixed keyboard hotkeys and resizing for wxMDIChildFrame
 menu bars.
-
+ 
 Added flag to wxSplitterWindow to update its children's
 sizes "live" instead of moving a XOR'ed bar around - this
 is a resource-draining option. Also corrected cursors
 in splitter window.
-
+ 
 New way to show "disabled" or greyed toolbar items.
-
+ 
 Rewrote parts of the tree ctrl to allow multiple selections
 and variable size items (Sylvain). These new function do not
 exist in the native Win32 tree control.
-
+ 
 Implemented global cursors and wxBusyCursor etc. Also removed
 another cursor misbehaviour.
-
+ 
 Updated many parts of the documentation to reflect changes
 in wxWindows 2.1, wxPython and more exact description of
 cross-platform issues as well as platform differences.
-
+ 
 Many other fixes, mainly by others...
-
+ 
 Further compile fixes for different architectures.
+ 
 
-
+  
-
 25th May '99: Fifth wxGTK 2.1 snapshot released
+  
 
-
+ 
-
 This is mostly a bug-fix release. We are having funny
 times to make wxGTK work well with different micro
 versions of GTK 1.2 - which is very close to impossible.
@@ -722,165 +718,165 @@ vary a lot. I use GTK 1.2.3 and only get wanrnings in
 one sample (notebook) and that one is due to a bug in
 GTK - some people using GTK 1.2.2 reported hundreds of warnings
 getting spitted out for what seems like no reason.
-
+ 
 This snapshot contains the beginnings of our merging of
 headers, meaning that in the future all ports will
 use the same headers and will share a lot more code.
 We have taken this moment to reorganize some code and
 hope to have eliminated much bad C++ code, as reported
 primarily by SGI's compilers (Vadim Zeitlin).
-
+ 
 Rewritten char and key event propagation routines
 to reflect documentation and do the same on wxGTK
 as on wxMSW. If you are interested in ascii chars
-and cursor key etc, intercept EVT_CHAR, if you
+and cursor key etc, intercept EVT_CHAR, if you 
 are interested in which key actually got pressed,
 intercept EVT_KEYDOWN (Norbert Irmer).
-
+ 
 Control that are given -1 as their ID no longer
 get arbitrary positive IDs assigned but arbitrary
 negative IDs. This had caused some trouble with ID clashes.
-
+ 
 wxWindow and wxScrolledWindow no longer use the
 wxScrollEvent, but the newly invented wxScrollWinEvent
 so that no mixing up of events sent from wxSliders
 or wxScrollbars placed in a wxWindow can occur.
-
+ 
 Added wxProgressDialog for use with long background
 work such as printing.
-
+ 
 Added drawing sample and scrolling sample, both of
 which show some misbehaviours...
-
+ 
 When drawing with the wxXOR logical mode, wxGTK now uses
 GdkXOR (instead of GdkInvert) and when drawing in wxINVERT logical
 mode, wxGTK now uses GdkInvert (as before). When you did some
 rubberband dragging and you used wxXOR and a black pen, then
 you should change wxINVERT.
-
+ 
 Applied more patches for SGI and HP-UX compilation.
-
+ 
 More updates for wxSockets (Guilhem Lavaux). Seems to be nearly
 finished.
-
+ 
-You can now use threads within your GUI again. Well,
+You can now use threads within your GUI again. Well, 
-at least if you know what you are doing and you had a look
+at least if you know what you are doing and you had a look 
 at the threads sample.
-
+ 
 wxGLCanvas updated so that it can share display lists
-over several windows and to not exhibit any flicker.
+over several windows and to not exhibit any flicker. 
 (Norber Irmer).
-
+ 
 wxNotebook revamped so that its process of creation matches
 wxMSW's more closely, also avoiding problems with wrong page
 number. Added InsertPage() and the possibility to prevent
 switching pages by intercepting the PAGE_CHANGING event. Also,
 wxNotebooks now get shown even if all pages are empty.
-
+ 
 Added Activate() to wxMDIChildFrame (Russel).
-
+ 
 Improved wxSplitterWindow behaviour and visual feed-back when
 given a minimal size etc (Bruce DeVisser).
-
+ 
 Minor updates to wxTreeCtrl, wxListBox, printing, wxClipboard,
 wxString, wxThreads and many others.
-
+ 
 Also wxMSW got a big face-lift, not to mention the new wxMac release...
-
+ 
-
+			
-
+  
 11th May '99: Fourth wxGTK 2.1 snapshot released
-
+  
-
+ 
 This is mostly a bug-fix release. This affects wxSocket, wxThread,
 and a few GUI classes. Also more work has been done and window
 placement and decorations etc. which we hope to have finished now.
-
+ 
 Applied patches for FreeBSD and SGI compilation (not yet finshed).
-
+ 
 Updated wxPython to beta 9.
-
+ 
 Made wxGLCanvas work again - strangely it flickers now...
-
+ 
 wxStaticText is currently broken with GTK 1.2.2 (which I don't
 yet have and thus could not fix). Also, scrolling subwindows
 (although much improved including a sample) doesn't work perfectly
 due to a bug in GTK 1.2.1 (probably 1.2.2 as well).
-
+ 
 Added wxStaticLine.
-
+  
 Note that the next release might bring about changes to keyboard
-handling and scroll event intercepting from wxScrolledWindow.
+handling and scroll event intercepting from wxScrolledWindow. 
-
+ 
 By and large much of the code has stabilized and won't be much
 *** different in the final wxWindows 2.1 release. Please test as ***
 much as you can.
-
+ 
 The next release will have a new build system.
+ 
 
-
+  
-
 3rd May '99: Third wxGTK 2.1 snapshot released
-
+  
-
+ 
 Updated INSTALL.txt and SYMBOLS.txt.
-
+ 
 Support for Unicode is now almost complete. Most samples work in
 both Unicode and non-Unicode mode. Thanks to Ove Kaaven and Vadim.
-
+ 
 Internal changes required for wxOLE and addition of a very experimental
 wxOLE code section using GNOME's Bonobo library (from GNOME's CVS).
-
+ 
 New version of wxPython that works with the wxGTK 2.1.
 This now includes a very comprensive test/demo suite. Thanks to
 Robin Dunn, Harm v.d. Heijden and others. Beware of the hang-man...
-
+ 
 More fine tuning of focus handling and GUI widgets.
-
+ 
 Complete rewrite of wxSocket classes (still experimental).
 Thanks to Guilhem Lavaux.
-
+  
 wxMenuBar supports underlined shortcuts like Windows does,
 indicated by a leading & character. wxMenus now have hotkeys
 such as in wxXt and wxMSW.
-
+  
 Rewritten MDI subsystem.
-
+  
 Correcetions and additions to the printing framework including
 a paper type database (Julian).
-
+ 
 Several controls now support more style flags for modifying
 look (and feel) of the controls and windows.
-
+ 
 New implementation of idle handlers, which now send an idle
 event only once after the event queue has been emptied (which
 is what happens in the wxMSW port as well), not regularly.
 This no longer forces wxGTK applications to sleep (by having
 to call usleep()) in idle time - giving more CPU slices to
 the application if desired.
-
+ 
 wxGLCanvas (the OpenGl for wxWindows) now accepts keyboard input.
-
+ 
 The usual number of compile and bug fixes from all involved.
+ 
 
-
+  
-
 21st April '99: Second wxGTK 2.1 snapshot released
-
+  
-
+ 
 Added much code for Unicode support. Still experimental, but looks very
 cool - thanks to Ove Kaaven and Vadim Zeitlin. If you are very brave, then
 you can compile wxGTK with "configure --with-unicode".
-
+ 
 More updates on the dreaded issue of making frames and dialogs impossible
 to resize etc.
-
+ 
 Drag and Drop works now under GTK 1.2 - at least basically when dragging
 and dropping text. The API is not entirely fixed yet but seems quite
 good now. Support for different actions (copy/move/link/..) still missing.
 I also removed support for GTK 1.0 Drag and Drop - this is just broken
 and unusable in GTK 1.0 and I don't want to fix it.
-
+ 
 I now embed the JPEG library and handlers for JPEG and GIF have been
 added to the existing PNG and BMP (and XPM for GTK version only). In
 the future, the RPMs will not contain these libraries but depend on
@@ -889,211 +885,211 @@ ship with everything that is needed for wxGTK so that no downloading
 of ten image libs will be required - also avoiding problems with ten
 different kinds of libJPEG-6.0.1.7.IV beta 7. We also updated the
 PNG code to the newest PNG version.
-
+ 
 wxImage now makes use of the fast rendering code as provided by
 GTK 1.2 whenever possible. This should mean a speed-up for graphics
 heavy apps.
-
+ 
 Many fixes all over. Also should compile with GTK 1.2.0 as opposed
 to only with GTK 1.2.1 now.
-
+ 
 wxPython still doesn't compile, I think.
+ 
 
-
+  
-
 12th April '99: First wxGTK 2.1 snapshot released
-
+  
-
+ 
 This is the first developers' version of wxWindows 2.1 for GTK. It's main
 new feature is that it supports GTK 1.2 (as opposed to GTK 1.0) which
 will make development within the GNOME evironment a lot easier.
-
+ 
 Apart from the move to GTK 1.2 and the changes (some major) that were
 required as part of that work, enhancement or corrections have been
-made to many of the non-GUI classes and functions (such as wxClipboard,
+made to many of the non-GUI classes and functions (such as wxClipboard, 
 wxThread, wxSocket, wxConfig)
 and a few GUI classes (accelerators in menus, listbox always with
 scrollbar, wxFrame honours Motif Window Manager hints, corrected tab
 traversal for broken GTK 1.0 widgets).
-
+ 
 There have been slight changes to the priting dialogs and their
 setup data (which might break apps using this code in previous
 versions). Also, a bug concerning printing white has been fixed
 (actually not tested).
-
+ 
 Although this is only the first 2.1 snapshot, there is little reason not
 to use it as many bugs from version 2.0 have been corrected. There are,
 pf course, still a few problem left with GTK 1.2 (some of which relate
 to bugs in GTK).
-
+ 
 I think I preserved backward compatility with GTK 1.0 and if not it
 should be easy to fix - but mostly I don't care.
-
+ 
 Drag'N'Drop is currently completely broken. Also, wxPython currently
 doesn't compile with this release. The OpenGL canvas still seems to
 work.
-
+ 
 Major targets for the final release (still a long way): a new configure
 system, support JPEG and GIF formats, wxHTML, super-duppah frame layout
-stuff, syntax-highlighting editor, possibly Unicode, possibly some GNOME
+stuff, syntax-highlighting editor, possibly Unicode, possibly some GNOME 
 gooddies, possibly world domination.
+ 
 
-
+  
-
 *** 5th March '99: wxWindows 2.0 released ***
-
+  
-
+ 
 This is the final version of wxWindows 2.0 for GTK. The versions for
 Windows and Motif (and also this version) are available form Julian Smart's
 site. The Mac version is still under development.
+ 
 
-
+  
-
 *** 19th February '99: wxWindows 2.0 beta 5 ***
-
+  
-
+ 
 This is the fifth beta release and it contains mostly bug fixes and
 updates for documentation.
-
+ 
 Applied compile fixes for Solaris (different flavours and compilers).
+ 
 
-
+  
-
 *** 12th February '99: wxWindows 2.0 beta 4 ***
-
+  
-
+ 
 This is the fourth beta release and it contains mostly bug fixes and
 updates for documentation.
-
+ 
 Tracked a few more cases, where the bahaviour between wxMSW and wxGTK
 differed. This was the case for closing a dialog or frame as well as
 for clearing a device context or setting its background colour and some
 other minor details.
-
+ 
 Most standard dialogs have been face-liftet a little.
-
+ 
 Implememted default buttons for GTK.
-
+ 
 Fixed many bugs. You guessed it.
+ 
 
-
+  
-
 *** 29th January '99: wxWindows 2.0 beta 3 ***
-
+  
-
+ 
-This is the third beta release and it contains mostly bug fixes.
+This is the third beta release and it contains mostly bug fixes. 
-
+ 
 There is one field where we haven't been able to fix the API yet, and that
 it Drag'n'Drop. This is mostly due to the fact that DnD in
 GTK 1.0 is hardly usable and much different from GTK 1.2 which means that
 we have to design a common API for Windows, GTK 1.0 and GTK 1.2. Although
 we are trying to prevent that, it is possible that wxWindows 2.0 (being
 based on GTK 1.0) will not have proper DnD support.
-
+ 
-The major changes are that tool tips have been added, threads have been completely
+The major changes are that tool tips have been added, threads have been completely 
-rewritten, the ODBC code has been updated and improved, the socket code works
+rewritten, the ODBC code has been updated and improved, the socket code works 
 better now.
-
+ 
 Classes for managing MIME-types under Windows and Unix have been added.
-
+ 
 There is now a wxGLCanvas class for OpenGl/Mesa for the Windows, GTK and
 Motif ports. Come see the penguins flying...
-
+ 
 Documentation has received a big face lift - it now covers nearly all the
 classes, at least.
-
+ 
 The usual amount of bug fixes. Countless.
-
+ 
 A few member functions of wxString have been renamed.
-
+ 
 For those who are using the ever-so-popular wxImage class (which
 now available on Motif and Windows as well) in 8-bit mode: wxGTK
 now creates a color cube upon start-up in 8-bit mode and thus the
 generation of bitmaps from images has been speeded up 20 times.
-
+ 
 It is now possible to develop with wxGTK without having the GTK 1.0 header
 files installed so that having the GTK 1.2 header files installed no longer
 is any problem. We also provide RPMs for RedHat glibc 2 based systems, compiled
 with egcs 1.1.1 on SuSE 6.0. Note that the RPM will   not   work in
 SuSE 6.0 as SuSE decided to ship 6.0 with a broken GTK+ package.
+ 
 
-
+  
-
 *** 6th January '99: wxWindows 2.0 beta 2 ***
-
+  
-
+ 
 This is the second beta release and contains it mostly build and
 bug fixes. Threads work well now on (up-to-date) glibc 2 systems,
 commercial Unices and Windows.
-
+ 
-
+			
-
+  
 *** 20th December '98: wxWindows 2.0 beta 1 ***
-
+  
-
+ 
 This is the first beta release and we have used the time before
 this release to tidy up some parts of the API. All releases from
 now on will be source code compatible but we reserve binary compatibility
 for the final release. Because of this, the actual library name of
-the beta version will not be 2.0 but 1.99, so that we prevent
+the beta version will not be 2.0 but 1.99, so that we prevent 
 conflicts with the final library later on. After the final release
 we'll only fix bugs so that there will be no reason to link any
 program statically with wxGTK.
-
+ 
 We changed the name of the shared library to include the version of
 the GTK used so that no conflicts emerge with simultaneous
 versions of wxWindows for GTK 1.0 and for GTK 1.2 and so on.
-
+ 
 As you can see, we have not moved to GTK 1.1.X as the different
 development versions are too different and buggy to be useful. We'll
 wait for a stable GTK 1.2 release (hardly 1.2.0) and start porting
 then.
-
+ 
 wxGTK now compiles without problems on anything between gcc 2.7.2 on
 Linux-x86 and egcs 1.1 on Linux-Alpha and egcs 1.0 on Sparc. This isn't
 as easy as it sounds...
-
+ 
 Available form this site are the Python bindings of wxWindows.
 Thanks to Robin Dunn for this tremendous contribution.
 Tkinter is dead, Java is dead, wxPython rules! That's all there is to say.
-
+ 
 Although only a few new classes have been added, many have been polished
 up substantially, the most visible are wxListCtrl, wxTreeCtrl and
 all classes related to printing. Also the DialogEd now functions
-much better than before. Drag'n'Drop is fucntional but probably won't
+much better than before. Drag'n'Drop is fucntional but probably won't 
 be perfect until we use GTK 1.2 and its much improved DnD features.
-
+ 
 wxClipboard has arrived and works for text. Other formats have not been
 tested carefully yet.
-
+ 
 wxMiniFrame has been added which might be useful for docking toolbars
 etc. Someone has already done that for the MSW port and we hope to
 include his very nice work later.
-
+ 
 wxDirDialog has been added (thanks to Harm von der Heijden).
-
+ 
 The entite "tab traveral" system for moving from item to item in
 a dialog has been rewritten. It now completely overrides the
 not-so-well-done GTK native tab system.
-
+ 
 Quite much has been done to improve the wxImage class, which is now
 available in the Windows port as well. Very useful for anything related
 to image processing. wxGTK also uses this class internally e.g. to scale
 bitmaps when the scale factor (e.g. zooming) of a drawing context
 has changed.
-
+  
 Some of the small and handy classes (wxDate, wxTime, wxVariant) have
 received a face-lift. wxList has been rewritten to make it possible
 to write type-safe lists. The collection of utility functions (wxFileFind etc)
 has been revamped and cleaned-up (thanks to Vadim Zeitlin, who has also
 greatly enhanced many basic classes, ranging wxString to the debug and
 log system).
-
+ 
 We removed some constructors of GDI classes (such as wxPen, wxColour)
 which took a pointer as a parameter. This lead to many errors among users
 resulting in unexpected behaviour so it was decided to remove these
 constructors.
-
+ 
 As the number of users and the number of test programs and samples
 is steadialy rising the core classes of wxWindows for MSW and GTK 1.0
 can be considered to be very stable if not outright bug-free. I haven't

samples/font/font.cpp

@@ -384,15 +384,15 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
 
     static const char *encodingNames[] =
     {
-        "Western European (ISO-8859-1)",
+        "West European (Latin 1)",
-        "Central European (ISO-8859-2)",
+        "Central European (Latin 2)",
-        "Cyrillic (ISO-8859-5)",
+        "Cyrillic (Latin 5)",
-        "Greek (ISO-8859-7)",
+        "Greek (Latin 7)",
-        "Western European with Euro (ISO-8859-15)",
+        "West European new (Latin 0)",
         "KOI8-R",
-        "Windows Central European (CP 1250)",
+        "Windows Latin 2",
-        "Windows Cyrillic (CP 1251)",
+        "Windows Cyrillic",
-        "Windows Western European (CP 1252)",
+        "Windows Latin 1",
     };
 
     int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo",

src/common/encconv.cpp

@@ -26,7 +26,7 @@
 #ifdef __BORLANDC__
 #include "../common/unictabl.inc"
 #else
-#include "unictabl.inc"
+#include "unictabl.inc" 
 #endif
 
 #if wxUSE_WCHAR_T
@@ -39,7 +39,7 @@ static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
 {
     for (int i = 0; encodings_list[i].table != NULL; i++)
     {
-        if (encodings_list[i].encoding == enc)
+        if (encodings_list[i].encoding == enc) 
             return encodings_list[i].table;
     }
     return NULL;
@@ -61,12 +61,12 @@ static int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2)
 static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl)
 {
     CharsetItem *rev = new CharsetItem[128];
-
+    
     for (int i = 0; i < 128; i++)
         rev[i].c = 128 + i, rev[i].u = tbl[i];
 
     qsort(rev, 128, sizeof(CharsetItem), CompareCharsetItems);
-
+    
     return rev;
 }
 
@@ -93,17 +93,17 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 #endif
 
     if (input_enc == output_enc) {m_JustCopy = TRUE; return TRUE;}
-
+    
     m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE);
     m_JustCopy = FALSE;
-
+    
     if (input_enc == wxFONTENCODING_UNICODE)
     {
         if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE;
 
         m_Table = new tchar[65536];
         for (i = 0; i < 128; i++)  m_Table[i] = (tchar)i; // 7bit ASCII
-        for (i = 128; i < 65536; i++)  m_Table[i] = (tchar)'?';
+        for (i = 128; i < 65536; i++)  m_Table[i] = (tchar)'?'; 
                 // FIXME - this should be character that means `unicode to charset' impossible, not '?'
 
         if (method == wxCONVERT_SUBSTITUTE)
@@ -118,7 +118,7 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
         m_UnicodeInput = TRUE;
         return TRUE;
     }
-
+    
     else
     {
         if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE;
@@ -126,33 +126,33 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
             if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE;
 
         m_UnicodeInput = FALSE;
-
+        
         m_Table = new tchar[256];
         for (i = 0; i < 128; i++)  m_Table[i] = (tchar)i; // 7bit ASCII
-
+        
         if (output_enc == wxFONTENCODING_UNICODE)
         {
             for (i = 0; i < 128; i++)  m_Table[128 + i] = (tchar)in_tbl[i];
             return TRUE;
         }
-        else
+        else 
         {
             CharsetItem *rev = BuildReverseTable(out_tbl);
             CharsetItem *item, key;
-
+            
-            for (i = 0; i < 128; i++)
+            for (i = 0; i < 128; i++)  
             {
                 key.u = in_tbl[i];
                 item = (CharsetItem*) bsearch(&key, rev, 128, sizeof(CharsetItem), CompareCharsetItems);
                 if (item == NULL && method == wxCONVERT_SUBSTITUTE)
-                    item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback,
+                    item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback, 
                                 encoding_unicode_fallback_count, sizeof(CharsetItem), CompareCharsetItems);
                 if (item)
                     m_Table[128 + i] = (tchar)item -> c;
                 else
                     m_Table[128 + i] = 128 + i; // don't know => don't touch
             }
-
+            
             delete[] rev;
             return TRUE;
         }
@@ -174,9 +174,9 @@ void wxEncodingConverter::Convert(const char* input, char* output)
         strcpy(output, input);
         return;
     }
-
+    
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-
+       
     for (i = input, o = output; *i != 0;)
         *(o++) = (char)(m_Table[(wxUint8)*(i++)]);
     *o = 0;
@@ -200,9 +200,9 @@ void wxEncodingConverter::Convert(const char* input, wchar_t* output)
         *o = 0;
         return;
     }
-
+    
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-
+       
     for (i = input, o = output; *i != 0;)
         *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);
     *o = 0;
@@ -225,9 +225,9 @@ void wxEncodingConverter::Convert(const wchar_t* input, char* output)
         *o = 0;
         return;
     }
-
+    
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-
+       
     for (i = input, o = output; *i != 0;)
         *(o++) = (char)(m_Table[(wxUint16)*(i++)]);
     *o = 0;
@@ -251,9 +251,9 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output)
         *o = 0;
         return;
     }
-
+    
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-
+       
     for (i = input, o = output; *i != 0;)
         *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);
     *o = 0;
@@ -265,12 +265,12 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output)
 wxString wxEncodingConverter::Convert(const wxString& input)
 {
     if (m_JustCopy) return input;
-
+    
     wxString s;
     const wxChar *i;
-
+    
     wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-
+    
     if (m_UnicodeInput)
         for (i = input.c_str(); *i != 0; i++)
             s << (wxChar)(m_Table[(wxUint16)*i]);
@@ -287,7 +287,7 @@ wxString wxEncodingConverter::Convert(const wxString& input)
 
 
 // Following tables describe classes of encoding equivalence.
-//
+// 
 
 #define STOP wxFONTENCODING_SYSTEM
 
@@ -296,17 +296,17 @@ wxString wxEncodingConverter::Convert(const wxString& input)
            // max no. of encodings for one language used on one platform
            // Anybody thinks 5 is not enough? ;-)
 
-static wxFontEncoding
+static wxFontEncoding 
     EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {
 
     // *** Please put more common encodings as first! ***
 
-    // Western European
+    // West European
     {
         /* unix    */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP},
         /* windows */ {wxFONTENCODING_CP1252, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {STOP}   
     },
 
     // Central European
@@ -314,15 +314,15 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_2, STOP},
         /* windows */ {wxFONTENCODING_CP1250, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {STOP}   
     },
-
+    
     // Baltic
     {
-        /* unix    */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4, STOP},
+        /* unix    */ {wxFONTENCODING_ISO8859_13, STOP},
         /* windows */ {wxFONTENCODING_CP1257, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {STOP}   
     },
 
     // Hebrew
@@ -330,7 +330,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_8, STOP},
         /* windows */ {wxFONTENCODING_CP1255, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {STOP}   
     },
 
     // Greek
@@ -338,7 +338,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_7, STOP},
         /* windows */ {wxFONTENCODING_CP1253, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {STOP}   
     },
 
     // Arabic
@@ -346,7 +346,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_6, STOP},
         /* windows */ {wxFONTENCODING_CP1256, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {STOP}   
     },
 
     // Turkish
@@ -354,15 +354,24 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_9, STOP},
         /* windows */ {wxFONTENCODING_CP1254, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {STOP}   
     },
 
     // Cyrillic
+    {
+        /* unix    */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4,
+                       wxFONTENCODING_ISO8859_15, wxFONTENCODING_ISO8859_1, STOP},
+        /* windows */ {wxFONTENCODING_CP1257, wxFONTENCODING_CP1252, STOP},
+        /* os2     */ {STOP},
+        /* mac     */ {STOP}   
+    },
+
+    // Russia and other KOI-8 users:
     {
         /* unix    */ {wxFONTENCODING_KOI8, wxFONTENCODING_ISO8859_5, STOP},
         /* windows */ {wxFONTENCODING_CP1251, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {STOP}   
     },
 
     {{STOP},{STOP},{STOP},{STOP}} /* Terminator */
@@ -386,7 +395,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
         platform = wxPLATFORM_MAC;
 #endif
     }
-
+    
     int i, clas, e ;
     wxFontEncoding *f;
     wxFontEncodingArray arr;
@@ -402,11 +411,11 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
                         if (*f == enc) arr.Add(enc);
                     for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)
                         if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f);
-                    i = NUM_OF_PLATFORMS/*hack*/; break;
+                    i = NUM_OF_PLATFORMS/*hack*/; break; 
                 }
         clas++;
     }
-
+    
     return arr;
 }
 
@@ -417,7 +426,7 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
     int i, clas, e, j ;
     wxFontEncoding *f;
     wxFontEncodingArray arr;
-
+    
     arr = GetPlatformEquivalents(enc); // we want them to be first items in array
 
     clas = 0;
@@ -428,12 +437,12 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
                 if (EquivalentEncodings[clas][i][e] == enc)
                 {
                     for (j = 0; j < NUM_OF_PLATFORMS; j++)
-                        for (f = EquivalentEncodings[clas][j]; *f != STOP; f++)
+                        for (f = EquivalentEncodings[clas][j]; *f != STOP; f++) 
-                            if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f);
+                            if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f);                            
-                    i = NUM_OF_PLATFORMS/*hack*/; break;
+                    i = NUM_OF_PLATFORMS/*hack*/; break; 
                 }
         clas++;
     }
-
+    
     return arr;
 }

src/common/fontmap.cpp

@@ -94,11 +94,11 @@ static wxFontEncoding gs_encodings[] =
 // the descriptions for them
 static const wxChar* gs_encodingDescs[] =
 {
-    wxTRANSLATE( "Western European (ISO-8859-1)" ),
+    wxTRANSLATE( "Western European (ISO-8859-1/Latin 1)" ),
-    wxTRANSLATE( "Central European (ISO-8859-2)" ),
+    wxTRANSLATE( "Central European (ISO-8859-2/Latin 2)" ),
     wxTRANSLATE( "Esperanto (ISO-8859-3)" ),
     wxTRANSLATE( "Baltic (old) (ISO-8859-4)" ),
-    wxTRANSLATE( "Cyrillic (ISO-8859-5)" ),
+    wxTRANSLATE( "Cyrillic (Latin 5)" ),
     wxTRANSLATE( "Arabic (ISO-8859-6)" ),
     wxTRANSLATE( "Greek (ISO-8859-7)" ),
     wxTRANSLATE( "Hebrew (ISO-8859-8)" ),
@@ -108,7 +108,7 @@ static const wxChar* gs_encodingDescs[] =
     wxTRANSLATE( "Indian (ISO-8859-12)" ),
     wxTRANSLATE( "Baltic (ISO-8859-13)" ),
     wxTRANSLATE( "Celtic (ISO-8859-14)" ),
-    wxTRANSLATE( "Western European with Euro (ISO-8859-15)" ),
+    wxTRANSLATE( "Western European with Euro (ISO-8859-15/Latin 0)" ),
     wxTRANSLATE( "KOI8-R" ),
     wxTRANSLATE( "Windows Central European (CP 1250)" ),
     wxTRANSLATE( "Windows Cyrillic (CP 1251)" ),

src/generic/grid.cpp

@@ -1387,12 +1387,12 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
             break;
 
         case WXK_TAB:
-            event.Skip( m_grid->GetEventHandler()->ProcessEvent( event ) );
+            event.Skip( m_grid->ProcessEvent( event ) );
             break;
 
         case WXK_RETURN:
         case WXK_NUMPAD_ENTER:
-            if (!m_grid->GetEventHandler()->ProcessEvent(event))
+            if (!m_grid->ProcessEvent(event))
                 m_editor->HandleReturn(event);
             break;
 
@@ -3117,12 +3117,12 @@ void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 
@@ -3176,12 +3176,12 @@ void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 
@@ -3234,12 +3234,12 @@ void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 
@@ -3308,12 +3308,12 @@ void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )

src/gtk/app.cpp

@@ -182,6 +182,9 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // thread so we must lock it here ourselves
     gdk_threads_enter();
 
+    // Sent idle event to all who request them
+    while (wxTheApp->ProcessIdle()) { }
+
     /* Indicate that we are now in idle mode - even so deeply
        in idle mode that we don't get any idle events anymore.
        this is like wxMSW where an idle event is sent only
@@ -190,9 +193,6 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     g_isIdle = TRUE;
     wxTheApp->m_idleTag = 0;
 
-    // Sent idle event to all who request them
-    while (wxTheApp->ProcessIdle()) { }
-
     // Release lock again
     gdk_threads_leave();
 

src/gtk/gauge.cpp

@@ -42,8 +42,6 @@ bool wxGauge::Create( wxWindow *parent, wxWindowID id,  int range,
     m_useProgressBar = TRUE;
   
     m_widget = gtk_progress_bar_new();
-    if( style & wxGA_VERTICAL)
-        gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget) , GTK_PROGRESS_BOTTOM_TO_TOP );
   
     m_parent->DoAddChild( this );
   

src/gtk1/app.cpp

@@ -182,6 +182,9 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // thread so we must lock it here ourselves
     gdk_threads_enter();
 
+    // Sent idle event to all who request them
+    while (wxTheApp->ProcessIdle()) { }
+
     /* Indicate that we are now in idle mode - even so deeply
        in idle mode that we don't get any idle events anymore.
        this is like wxMSW where an idle event is sent only
@@ -190,9 +193,6 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     g_isIdle = TRUE;
     wxTheApp->m_idleTag = 0;
 
-    // Sent idle event to all who request them
-    while (wxTheApp->ProcessIdle()) { }
-
     // Release lock again
     gdk_threads_leave();
 

src/gtk1/gauge.cpp

@@ -42,8 +42,6 @@ bool wxGauge::Create( wxWindow *parent, wxWindowID id,  int range,
     m_useProgressBar = TRUE;
   
     m_widget = gtk_progress_bar_new();
-    if( style & wxGA_VERTICAL)
-        gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget) , GTK_PROGRESS_BOTTOM_TO_TOP );
   
     m_parent->DoAddChild( this );
   

src/msw/choice.cpp

@@ -106,20 +106,6 @@ int wxChoice::DoAppend(const wxString& item)
         wxLogLastError(wxT("SendMessage(CB_ADDSTRING)"));
     }
 
-    // if we were created empty, the choice is too small to show any items, so
-    // resize it - but as we do it once only, give it some reasonable size
-    if ( GetCount() == 1 )
-    {
-        wxSize size = GetSize();
-        int cx, cy;
-        wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
-
-        size.y = 11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
-
-        // don't call our SetSize() as it ignores the height parameter
-        wxControl::DoSetSize(-1, -1, size.x, size.y, wxSIZE_USE_EXISTING);
-    }
-
     return n;
 }
 
@@ -301,13 +287,7 @@ wxSize wxChoice::DoGetBestSize() const
 
     wChoice += 5*cx;
 
-    if ( nItems > 10 )
+    int hChoice = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
-    {
-        // don't make the control too big
-        nItems = 10;
-    }
-
-    int hChoice = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*(nItems + 1);
 
     return wxSize(wChoice, hChoice);
 }

src/msw/dc.cpp

@@ -1115,7 +1115,6 @@ void wxDC::SetBackgroundMode(int mode)
         ::SetBkMode(GetHdc(), TRANSPARENT);
     else
         ::SetBkMode(GetHdc(), OPAQUE);
-	Last change:  AC   29 Jan 101    8:54 pm
 */
 }
 
@@ -1441,7 +1440,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         // of the mask which is also contrary to the Windows one)
         success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
                             GetHdcOf(*source), xsrc, ysrc,
-                            (HBITMAP)mask->GetMaskBitmap(), xsrc, ysrc,
+                            (HBITMAP)mask->GetMaskBitmap(), 0, 0,
                             MAKEROP4(dwRop, DSTCOPY)) != 0;
 
         if ( !success )

wxPython/contrib/glcanvas/stub.cpp

@@ -0,0 +1,24 @@
+/* Definitions for Windows/Unix exporting */
+#if defined(__WIN32__)
+#   if defined(_MSC_VER)
+#	define SWIGEXPORT(a) __declspec(dllexport) a
+#   else
+#	if defined(__BORLANDC__)
+#	    define SWIGEXPORT(a) a _export
+#	else
+#	    define SWIGEXPORT(a) a
+#	endif
+#   endif
+#else
+#   define SWIGEXPORT(a) a
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C"
+#endif
+SWIGEXPORT(void) initglcanvasc() {
+}
+
+

wxPython/contrib/ogl/stub.cpp

@@ -0,0 +1,24 @@
+/* Definitions for Windows/Unix exporting */
+#if defined(__WIN32__)
+#   if defined(_MSC_VER)
+#	define SWIGEXPORT(a) __declspec(dllexport) a
+#   else
+#	if defined(__BORLANDC__)
+#	    define SWIGEXPORT(a) a _export
+#	else
+#	    define SWIGEXPORT(a) a
+#	endif
+#   endif
+#else
+#   define SWIGEXPORT(a) a
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C"
+#endif
+SWIGEXPORT(void) initoglc() {
+}
+
+

wxPython/contrib/stc/stub.cpp

@@ -0,0 +1,23 @@
+/* Definitions for Windows/Unix exporting */
+#if defined(__WIN32__)
+#   if defined(_MSC_VER)
+#	define SWIGEXPORT(a) __declspec(dllexport) a
+#   else
+#	if defined(__BORLANDC__)
+#	    define SWIGEXPORT(a) a _export
+#	else
+#	    define SWIGEXPORT(a) a
+#	endif
+#   endif
+#else
+#   define SWIGEXPORT(a) a
+#endif
+
+
+#ifdef __cplusplus
+extern "C"
+#endif
+SWIGEXPORT(void) initstc_c() {
+}
+
+

wxPython/setup.py

@@ -249,7 +249,7 @@ if not GL_ONLY:
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
                     )
-    wxpExtensions.append(ext)
+        wxpExtensions.append(ext)
 
 
     # Extension for the grid module