Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increased version to 2.2.0,

Browse Source 
Fixed minor waste in wxSizerItem,
  Changed wxGTK internal timer settings so that
    idle time is really after GTK finished.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-06-09 18:46:33 +00:00
parent 59277cb364
commit 0f9a3aaea8
10 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -906,8 +906,8 @@ test "$host_alias" != "$target_alias" &&
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=1
WX_RELEASE_NUMBER=16
WX_MINOR_VERSION_NUMBER=2
WX_RELEASE_NUMBER=0
WX_INTERFACE_AGE=0
WX_BINARY_AGE=0

4
configure.in
View File

@@ -456,8 +456,8 @@ dnl
dnl WX_INTERFACE_AGE = 0
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=1
WX_RELEASE_NUMBER=16
WX_MINOR_VERSION_NUMBER=2
WX_RELEASE_NUMBER=0
WX_INTERFACE_AGE=0
WX_BINARY_AGE=0

10
docs/gtk/changes.txt
View File

@@ -1,4 +1,8 @@
4th June '2000: wxWindows pre-2.2 release
20th June 2000: wxWindows 2.2 released
Minor bug-fixes.
4th June 2000: wxWindows pre-2.2 release
Complete freeze now. Only vital bug-fixes allowed.
@@ -10,12 +14,12 @@ Reworked wxURL.
MANY bugfixes.
22th March '2000: wxWindows 2.1.15 released
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
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

18
docs/gtk/readme.txt
View File

@@ -1,19 +1,13 @@
Welcome to wxWindows/Gtk pre 2.2
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 a pre-release. wxWindows is now in a complete
freeze and only vital 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.7 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.16.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.

3
include/wx/sizer.h
View File

@@ -95,11 +95,14 @@ public:
{ return m_border; }
wxObject* GetUserData()
{ return m_userData; }
wxPoint GetPosition()
{ return m_pos; }
protected:
wxWindow *m_window;
wxSizer *m_sizer;
wxSize m_size;
wxPoint m_pos;
wxSize m_minSize;
int m_option;
int m_border;

6
include/wx/version.h
View File

@@ -14,9 +14,9 @@
// Bump-up with each new version
#define wxMAJOR_VERSION 2
#define wxMINOR_VERSION 1
#define wxRELEASE_NUMBER 16
#define wxVERSION_STRING _T("wxWindows 2.1.16")
#define wxMINOR_VERSION 2
#define wxRELEASE_NUMBER 2
#define wxVERSION_STRING _T("wxWindows 2.2.0")
#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)

2
src/common/sizer.cpp
View File

@@ -163,6 +163,8 @@ wxSize wxSizerItem::CalcMin()
void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
{
m_pos = pos;
if (m_flag & wxWEST)
{
pos.x += m_border;

4
src/gtk/app.cpp
View File

@@ -179,7 +179,7 @@ void wxapp_install_idle_handler()
to the main thread (and processing these in
idle time). Very low priority. */
wxTheApp->m_idleTag = gtk_idle_add_priority( 0, wxapp_idle_callback, (gpointer) NULL );
wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
g_isIdle = FALSE;
}
@@ -250,7 +250,7 @@ wxApp::wxApp()
m_topWindow = (wxWindow *) NULL;
m_exitOnFrameDelete = TRUE;
m_idleTag = gtk_idle_add_priority( 0, wxapp_idle_callback, (gpointer) NULL );
m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
#if wxUSE_THREADS
m_wakeUpTimerTag = 0;

4
src/gtk1/app.cpp
View File

@@ -179,7 +179,7 @@ void wxapp_install_idle_handler()
to the main thread (and processing these in
idle time). Very low priority. */
wxTheApp->m_idleTag = gtk_idle_add_priority( 0, wxapp_idle_callback, (gpointer) NULL );
wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
g_isIdle = FALSE;
}
@@ -250,7 +250,7 @@ wxApp::wxApp()
m_topWindow = (wxWindow *) NULL;
m_exitOnFrameDelete = TRUE;
m_idleTag = gtk_idle_add_priority( 0, wxapp_idle_callback, (gpointer) NULL );
m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
#if wxUSE_THREADS
m_wakeUpTimerTag = 0;

4
wxGTK.spec
View File

@@ -1,6 +1,6 @@
# Note that this is NOT a relocatable package
%define pref /usr
%define ver 2.1.16
%define ver 2.2.0
%define rel 0
Summary: The GTK+ 1.2 port of the wxWindows library
@@ -10,7 +10,7 @@ Release: %{rel}
Copyright: wxWindows Licence
Group: X11/Libraries
Source: wxGTK-%{ver}.tgz
URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
URL: http://wesley.informatik.uni-freiburg.de/~wxxt
Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
BuildRoot: /tmp/wxgtk_root