merged 2.2 branch

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

docs/gtk/changes.txt

@@ -1,4 +1,52 @@
-19th March '2000: wxWindows 2.1.14 released
+10th July 2000: wxWindows 2.2 released
+
+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
+
+Complete freeze now. Only vital bug-fixes allowed.
+
+Various enhancements to wxSizer.
+
+Added wxGridSizer and wxFlexGridSizer.
+
+Reworked wxURL.
+
+MANY bugfixes.
+
+22th March 2000: wxWindows 2.1.15 released
+
+Build fix. RPMs no loner require GTK's include files.
+
+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 

docs/gtk/install.txt

@@ -1,7 +1,7 @@
 
   !!! When sending bug reports tell us what version of wxWindows you are 
       using (including the beta) and what compiler on what system. One 
-      example: wxGTK 2.1 beta 6, egcs 1.1.1, Redhat 5.0 !!!
+      example: wxGTK 2.2.0, egcs 1.1.1, Redhat 6.2 !!!
 
 * The most simple case
 -----------------------

docs/gtk/makewxgtk

@@ -6,6 +6,6 @@
 # if you're feeling braven, you may wish to compile with threads.
 # -- Julian Smart
 rm -f *.cache
-chmod a+x configure config.sub config.guess samples/configure contrib/configure
+chmod a+x configure config.sub config.guess samples/configure demos/configure contrib/configure
 ./configure --disable-shared --with-gtk --with-debug_flag --with-debug_info --enable-debug --without-threads --without-sockets -without-odbc -without-libjpeg
 make

docs/gtk/readme.txt

@@ -1,19 +1,13 @@
 
-   Welcome to wxWindows/Gtk 2.1.14
+   Welcome to wxWindows/Gtk 2.2
 
-you have downloaded a beta version of the GTK+ 1.2 port of 
-the wxWindows GUI library. Although this is not yet the
-final stable release wxGTK 2.2, the current version has
-been tested carefully on many systems and has been found
-to work better than any other previous version.
-
-This is the last beta release. wxWindows is now in a code
-freeze and only bugs will be corrected.
+you have downloaded version 2.2 of the GTK port of the 
+wxWindows GUI library.
 
 wxWindows no longer supports GTK 1.0 (as did some early
 snapshots) so that you will need GTK 1.2 when using it.
-GTK 1.2.6 is recommended although some programs will work
-with GTK 1.2.3 onwards.
+GTK 1.2.6 or above is recommended although some programs 
+will work with GTK 1.2.3 onwards.
 
 More information is available from my homepage at:
 
@@ -44,7 +38,7 @@ VERSION OF GTK, WXGTK, WHAT DISTRIBUTION YOU USE AND WHAT ERROR
 WAS REPORTED. I know this has no effect, but I tried...
 
 The library produced by the install process will be called 
-libwx_gtk.a (static) and libwx_gtk-2.1.so.14.0.0 (shared) so 
+libwx_gtk.a (static) and libwx_gtk-2.2.so.0.0.0 (shared) so 
 that once a binary incompatible version of wxWindows/Gtk comes 
 out we'll augment the library version number to avoid linking 
 problems.

docs/gtk/todo.txt

@@ -1,23 +1,28 @@
 
 -------------------- High priority ---------------------
 
-Improve, update translations. Install *.mo files somewehere.
+Improve, update translations. Install *.mo files somewhere.
 
 -------------------- Medium priority ---------------------
 
+wxBitmapButton doesn't refresh when parent gets refreshed.
+  -> Not important.
+
 Show accelerator control labels and actually implement them
-  -> Changed in GTK 1.2 (so let's do it for 1.2). Difficult.
+  -> Difficult.
   
 -------------------- Low priority ---------------------
     
 Right aligned checkboxes: focus highlighting is wrong, tooltips can't be set can't be set
+  -> Postponed. GTK 1.4 can do that.
+
+Add wxNoteBook::GetPageIndex()
+Add wxNoteBook::SetTabPosition()
+  -> Postponed.
 
 More testing of Unicode support.
   -> Postponed.
 
-OwnerDraw for wxListCtrl and others
-  -> Hardly necessary.
-
 Implement wxPalette
   -> Postponed.