Various distrib things,

  Applied patches for HP-UX compilation,
  Corrected (?) vetoing of tree expansion,
  Raised version.h to 2.1.10

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

diff --git a/configure.in b/configure.in
index 692bb28004ac48922312aec935f656db897ea97b..271915df937c2d0f8e5ad29a48a4244eb4f5a286 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -446,7 +446,7 @@ dnl WX_INTERFACE_AGE = 0
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=0
+WX_RELEASE_NUMBER=10
 
 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0

diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt
index 9252a4f586f909c67af84ed870e13735e3a07dd0..23fb6c6fbeea7fd763b7122ba1a5c7e1b559e18d 100644 (file)
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,4 +1,78 @@
 
+25th October '99: My birthday, wxWindows 2.1.10 released
+
+Enlightment has struck the majority of the developers and
+they have chosen ti use the Linux kernel numbering scheme
+for wxWindows from now on. This means that the next stable
+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 will be maintained. It was
+almost universally 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.
+
+Many build fixes for various platforms have been applied,
+try again, poor HP-UX and *BSD users, but don't reckon
+with immediate success.
+
+My total rewrite of the wxWindows underlying GTK widget
+has turned scrolling including subwindows from barely
+functional to pretty and fast.
+
+wxSocket and Co. have been improved up to the point of
+calling it a rewrite. It works on wxMSW now too and
+seems pretty stable, but testing is still welcome.
+
+The ODBC classes contributed by Remstar Inc. have been
+overhauled (incl the sample) and have been tested with
+all relevant SQL databases (even DBase). For that reason
+I have reawakened the iODBC code from wxGTK 2.0 so you
+can now use wxODBC from wxMSW and wxGTK.
+
+Several printing things fixed.
+
+HTML widget and its wxWindows' help system based upon
+it have been reorganized and improved for easier use
+from Python and C++.
+
+wxSpinCtrl added. Like a wxSpinButton and a wxTextCtrl.
+
+Changed the beaviour of the popular new wxFileDialog to
+not forget the once typed file name when changing the
+directory.
+
+Implemented the wxSIMPLE_BORDER flag (simple black line
+without shadow affect).
+
+Michael is writing a complete rewrite of the antiquated
+wxGrid. This is still work-in-progress and might not make
+it into wxWindows 2.2, we'll see. Help would be welcome
+to make that happen.
+
+Made wxMenu code lose less memory, also added wxMenu::Delete().
+
+Added code to send wxActivateEvent to MDI windows.
+
+Vadim added configure things to compile wxWindows without any
+GUI library. This is probably work in progress. He'll also add
+a wxFontEnumerator class and has enhanced wxFont to make use
+of char-encodings.
+
+wxSlider, wxWindow, wxScrollBar now emit the correct events
+for scrolling (like page up, line up etc) instead of just
+"thumb-track" as before.
+
+Corrected bug in Reparent() code.
+
+A handler to read PCX file (in most variants) has been added.
+
+A number of problems with compressed and socket streams have
+been solved.
+
 28th August '99: Ninth wxGTK 2.1 snapshot released
 
 As the old makefile system didn't work, I trashed it and wrote

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index e2378b42d3e6ba34b2d6607117551027296f55f6..69cd1f478de04ccac630b9e38edc2f5b02fd32d6 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -281,11 +281,7 @@ public:
     }
 
 private:
-#ifdef __MWERKS__
-    friend class wxSplitterWindow;
-#else
-    friend wxSplitterWindow;
-#endif
+    friend class WXDLLEXPORT wxSplitterWindow;
 
     // data for the different types of event
     union

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 70d3342c60044d1f9902fdfccca98ae86ab4f952..b9ea9b791ee99978dd7b04a58ad75e8dae5fa7e0 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -32,11 +32,7 @@ class wxMimeTypesManagerImpl;
 // the accessors *must* be checked!
 class WXDLLEXPORT wxFileType
 {
-#ifdef __MWERKS__
-friend class wxMimeTypesManagerImpl;  // it has access to m_impl
-#else
-friend wxMimeTypesManagerImpl;  // it has access to m_impl
-#endif
+friend class WXDLLEXPORT wxMimeTypesManagerImpl;  // it has access to m_impl
 
 public:
     // An object of this class must be passed to Get{Open|Print}Command. The

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 631c3393acc64c4449f1643b60195cd87309802f..6b7785c3eec79e98c3a57b71f1a6618e6705e8ed 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -62,11 +62,7 @@ enum wxTreeItemIcon
 
 class WXDLLEXPORT wxTreeEvent : public wxNotifyEvent
 {
-#ifdef __MWERKS__
-    friend class wxTreeCtrl;
-#else
-    friend wxTreeCtrl;
-#endif
+    friend class WXDLLEXPORT wxTreeCtrl;
 
 public:
     wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);

diff --git a/include/wx/version.h b/include/wx/version.h
index 14c415205607c814a3445051f770169fc6b0f655..7b1f21ce054e44c26b947ac01cb2dd162ef7c57b 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -15,10 +15,10 @@
 /* Bump-up with each new version */
 #define wxMAJOR_VERSION    2
 #define wxMINOR_VERSION    1
-#define wxRELEASE_NUMBER   0
-#define wxVERSION_STRING "wxWindows 2.1.0"
+#define wxRELEASE_NUMBER   10
+#define wxVERSION_STRING "wxWindows 2.1.10"
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
-#define wxBETA_NUMBER      9
+#define wxBETA_NUMBER      0
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
 
 #endif

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 57b181dd44f7c14fc0bf1247ead791e0f2cbd339..edfceee22510faac3b9bebe825105b8b96753d04 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -963,7 +963,9 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId)
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() );
   event.m_item = item;
   event.SetEventObject( this );
-  if ( ProcessEvent( event ) && event.m_code )
+  
+//  if ( ProcessEvent( event ) && event.m_code )  TODO: Was this a typo ?
+  if ( ProcessEvent( event ) && !event.IsAllowed() )
   {
     // cancelled by program
     return;

diff --git a/wxGTK.spec b/wxGTK.spec
index 89ac458588c53c9bbac8b15e3d479a49cd7fc326..f90e6e65f7c5fd6189fe8f8c1c8b26ee59cad7b0 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,7 +1,7 @@
 # Note that this is NOT a relocatable package
 %define pref /usr
-%define ver 2.1.0
-%define rel 9
+%define ver 2.1.10
+%define rel 0
 
 Summary: The GTK+ 1.2 port of the wxWindows library
 Name: wxGTK
@@ -9,10 +9,9 @@ Version: %{ver}
 Release: %{rel}
 Copyright: wxWindows Licence
 Group: X11/Libraries
-Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.0-b9.tgz
+Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.10.tgz
 URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
 Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
-Requires: gtk+ >= 1.2.1
 BuildRoot: /tmp/wxgtk_root
 
 # all packages providing an implementation of wxWindows library (regardless of