Bumped up version to 2.1.16.

Semi-fixed list ctrl's header again.


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

configure.in

@@ -457,7 +457,7 @@ dnl WX_INTERFACE_AGE = 0
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=15
+WX_RELEASE_NUMBER=16
 
 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0

docs/gtk/changes.txt

@@ -1,6 +1,6 @@
-1st May '2000: wxWindows 2.1.16 release
+23rd May '2000: wxWindows pre-2.2 release
 
-It was time for another beta.
+Complete freeze now. Only vital bug-fixes allowed.
 
 Various enhancements to wxSizer.
 
@@ -8,6 +8,8 @@ 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.

docs/gtk/readme.txt

@@ -1,5 +1,5 @@
 
-   Welcome to wxWindows/Gtk 2.1.16
+   Welcome to wxWindows/Gtk pre 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
@@ -7,12 +7,12 @@ 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
+This is the a pre-release. wxWindows is now in a complete
-freeze and only bugs will be corrected.
+freeze and only vital bugs will be corrected.
 
 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
+GTK 1.2.7 is recommended although some programs will work
 with GTK 1.2.3 onwards.
 
 More information is available from my homepage at:

docs/gtk/todo.txt

@@ -3,26 +3,24 @@
 
 Improve, update translations. Install *.mo files somewehere.
 
-wxFrame::SetMenuBar() bug
+Fix wxMenu::Replace() bug reported weeks ago.
-
-Add wxNoteBook::GetPageIndex()
-
-Correct insert point in wxTextCtrl::SetValue()
-
-wxBitmapButton doesn't refresh when parent gets refreshed
-
-reverse log.h menu.h in menu.cpp
-
-wxMDIXXXX:SetTitle() has no effect
 
 -------------------- 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.

include/wx/version.h

@@ -15,8 +15,8 @@
 // Bump-up with each new version
 #define wxMAJOR_VERSION    2
 #define wxMINOR_VERSION    1
-#define wxRELEASE_NUMBER   15
+#define wxRELEASE_NUMBER   16
-#define wxVERSION_STRING   _T("wxWindows 2.1.15")
+#define wxVERSION_STRING   _T("wxWindows 2.1.16")
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
 #define wxBETA_NUMBER      0
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)

src/generic/listctrl.cpp

@@ -1258,15 +1258,11 @@ void wxListHeaderWindow::DrawCurrent()
 
 void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 {
-    // translate x coord as we're shifted with the horz scrollbar of the main
+    wxCoord x = (wxCoord)event.GetX();
-    // window, but not the y one as we don't care about the vert scrollbar
+    wxCoord y = (wxCoord)event.GetY();
-    wxCoord xLog,
+    
-            x = (wxCoord)event.GetX(),
+    m_owner->CalcUnscrolledPosition( x, 0, &x, NULL );
-            y = (wxCoord)event.GetY();
+    
-    m_owner->CalcUnscrolledPosition( x, 0, &xLog, NULL );
-
-    m_owner->GetViewStart(&m_minX, NULL);
-
     if (m_isDragging)
     {
         DrawCurrent();
@@ -1279,30 +1275,31 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
         else
         {
             int size_x = 0;
-            m_owner->GetVirtualSize( &size_x, NULL );
+            int dummy;
-            if (xLog > m_minX+7)
+            GetClientSize( &size_x, & dummy );
-                m_currentX = xLog;
+            if (x > m_minX+7)
+                m_currentX = x;
             else
                 m_currentX = m_minX+7;
-            if (m_currentX > size_x-7)
+            if (m_currentX > size_x-7) m_currentX = size_x-7;
-                m_currentX = size_x-7;
             DrawCurrent();
         }
         return;
     }
 
+    m_minX = 0;
     bool hit_border = FALSE;
     int xpos = 0;
     for (int j = 0; j < m_owner->GetColumnCount(); j++)
     {
         xpos += m_owner->GetColumnWidth( j );
         m_column = j;
-        if ((abs(xLog-xpos) < 3) && (y < 22) && (m_column < m_owner->GetColumnCount()-1))
+        if ((abs(x-xpos) < 3) && (y < 22) && (m_column < m_owner->GetColumnCount()-1))
         {
             hit_border = TRUE;
             break;
         }
-        if (xLog-xpos < 0)
+        if (x-xpos < 0)
         {
             break;
         }
@@ -1329,6 +1326,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
         }
     }
 
+
     if (event.Moving())
     {
         bool setCursor;

wxBase.spec

@@ -1,6 +1,6 @@
 # Note that this is NOT a relocatable package
 %define pref /usr
-%define ver 2.1.14
+%define ver 2.1.16
 %define rel 0
 
 Summary: wxBase library - non-GUI support classes of wxWindows toolkit

wxGTK.spec

@@ -1,6 +1,6 @@
 # Note that this is NOT a relocatable package
 %define pref /usr
-%define ver 2.1.15
+%define ver 2.1.16
 %define rel 0
 
 Summary: The GTK+ 1.2 port of the wxWindows library

wxMotif.spec

@@ -3,7 +3,7 @@
 
 # Note that this is NOT a relocatable package
 %define pref /usr
-%define ver 2.1.15
+%define ver 2.1.16
 %define rel 0
 
 Summary: The Motif/Lesstif port of the wxWindows library