From: Robert Roebling Date: Mon, 24 Jan 2000 13:13:41 +0000 (+0000) Subject: Added geometry.cpp and made it compile, X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/510fc784c0c7002488bcaad881901176554f7c32 Added geometry.cpp and made it compile, Added empty dndcmn.cpp to avoid GNU link warnings, Fixed problem with event.Skip() in new tab code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index e441f8afa5..75f1e59335 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # -# This file was automatically generated by tmake at 17:45, 2000/01/23 +# This file was automatically generated by tmake at 13:39, 2000/01/24 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -823,6 +823,7 @@ GTK_COMMONOBJS = \ dbtable.o \ dcbase.o \ dlgcmn.o \ + dndcmn.o \ dobjcmn.o \ docmdi.o \ docview.o \ @@ -843,6 +844,7 @@ GTK_COMMONOBJS = \ fs_zip.o \ ftp.o \ gdicmn.o \ + geometry.o \ gifdecod.o \ hash.o \ helpbase.o \ @@ -921,6 +923,7 @@ GTK_COMMONDEPS = \ dbtable.d \ dcbase.d \ dlgcmn.d \ + dndcmn.d \ dobjcmn.d \ docmdi.d \ docview.d \ @@ -941,6 +944,7 @@ GTK_COMMONDEPS = \ fs_zip.d \ ftp.d \ gdicmn.d \ + geometry.d \ gifdecod.d \ hash.d \ helpbase.d \ @@ -1221,6 +1225,7 @@ MOTIF_COMMONOBJS = \ dbtable.o \ dcbase.o \ dlgcmn.o \ + dndcmn.o \ dobjcmn.o \ docmdi.o \ docview.o \ @@ -1241,6 +1246,7 @@ MOTIF_COMMONOBJS = \ fs_zip.o \ ftp.o \ gdicmn.o \ + geometry.o \ gifdecod.o \ hash.o \ helpbase.o \ @@ -1319,6 +1325,7 @@ MOTIF_COMMONDEPS = \ dbtable.d \ dcbase.d \ dlgcmn.d \ + dndcmn.d \ dobjcmn.d \ docmdi.d \ docview.d \ @@ -1339,6 +1346,7 @@ MOTIF_COMMONDEPS = \ fs_zip.d \ ftp.d \ gdicmn.d \ + geometry.d \ gifdecod.d \ hash.d \ helpbase.d \ @@ -1575,6 +1583,7 @@ MSW_COMMONOBJS = \ dbtable.o \ dcbase.o \ dlgcmn.o \ + dndcmn.o \ dobjcmn.o \ docmdi.o \ docview.o \ @@ -1595,6 +1604,7 @@ MSW_COMMONOBJS = \ fs_zip.o \ ftp.o \ gdicmn.o \ + geometry.o \ gifdecod.o \ hash.o \ helpbase.o \ @@ -1674,6 +1684,7 @@ MSW_COMMONDEPS = \ dbtable.d \ dcbase.d \ dlgcmn.d \ + dndcmn.d \ dobjcmn.d \ docmdi.d \ docview.d \ @@ -1694,6 +1705,7 @@ MSW_COMMONDEPS = \ fs_zip.d \ ftp.d \ gdicmn.d \ + geometry.d \ gifdecod.d \ hash.d \ helpbase.d \ @@ -2031,6 +2043,7 @@ PM_COMMONOBJS = \ dbtable.o \ dcbase.o \ dlgcmn.o \ + dndcmn.o \ dobjcmn.o \ docmdi.o \ docview.o \ @@ -2051,6 +2064,7 @@ PM_COMMONOBJS = \ fs_zip.o \ ftp.o \ gdicmn.o \ + geometry.o \ gifdecod.o \ hash.o \ helpbase.o \ @@ -2130,6 +2144,7 @@ PM_COMMONDEPS = \ dbtable.d \ dcbase.d \ dlgcmn.d \ + dndcmn.d \ dobjcmn.d \ docmdi.d \ docview.d \ @@ -2150,6 +2165,7 @@ PM_COMMONDEPS = \ fs_zip.d \ ftp.d \ gdicmn.d \ + geometry.d \ gifdecod.d \ hash.d \ helpbase.d \ diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 09b96c49b1..66667368a0 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -115,6 +115,7 @@ dbtable.cpp C dcbase.cpp C dlgcmn.cpp C dobjcmn.cpp C +dndcmn.cpp C docmdi.cpp C docview.cpp C dynarray.cpp C B @@ -134,6 +135,7 @@ fs_inet.cpp C fs_zip.cpp C ftp.cpp C S gdicmn.cpp C +geometry.cpp C gifdecod.cpp C hash.cpp C B helpbase.cpp C diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt index b3208b29d5..a0ae7a93d9 100644 --- a/docs/gtk/changes.txt +++ b/docs/gtk/changes.txt @@ -1,17 +1,25 @@ 24th January '2000: wxWindows 2.1.13 released +Corrections to TAB handling in notebooks. + +Added scroll event to indicate when the thumb has +been released (as opposed to only changed). + Fixed crashes with GTK Pixmap theme. Fixed endianness problems in image code. -Minor fixes for sockets related to GUI reentrance and others. +Minor fixes for sockets related to GUI reentrance. Also +improved the IPV address class and added more error +checking and rekated things. Many enhancements to wxHTML, more tags supported, better support -for non-English texts etc. +for non-western texts etc. Corrected code handling mono-bitmaps and their conversion to -wxImage etc. +wxImage etc. Added experimental ConvertToMonoBitmap() to +wxImage class. Fixed a few minor problems in wxListCtrl. @@ -19,7 +27,7 @@ The MIME-type code in now reads KDE and GNOME mime-type bindings including icon information. This is used in the file dialog. Small fix for problems with code that didn't changed the size of a -window, but not its client size. +window, but its client size and thus sent no wxSizeEvent. Fixed problem with shared contexts in OpenGl canvas. @@ -34,6 +42,8 @@ Revamped code for TCP based connections between programs. Updates to the ODBC classes (George Tasker). +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 diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index 838b2bd455..8ab7547690 100644 --- a/docs/gtk/install.txt +++ b/docs/gtk/install.txt @@ -151,7 +151,7 @@ START-UP! Just always use egcs and be happy. Please send comments and question about the OS/2 installation to Andrea Venturoli and patches to -make to me (Robert Roebling) or the wxWindows mailing list. +the wxWindows mailing list. You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3 or newer), GTK+ (1.2.1 or newer), emx (0.9d fix 1), flex (2.5.4), yacc (1.8), @@ -238,7 +238,7 @@ you download wxGTK, it will default to --with-gtk etc. But if you use all of our CVS repository you have to choose a toolkit. You must do this by running configure with either of: - --without-gtk Don't use the GIMP ToolKit (GTK) + --without-gtk Don't use the GIMP ToolKit (GTK) --with-motif Use either Motif or Lesstif Configure will look for both. @@ -251,14 +251,14 @@ The following options handle the kind of library you want to build. --enable-static Create static libraries. - --disable-optimise Do not optimise the code. Can + --disable-optimise Do not optimise the code. Can sometimes be useful for debugging and is required on some architectures such as Sun with gcc 2.8.X which would otherwise produce segvs. --enable-profile Add profiling info to the object - files. Currently broken, I think. + files. Currently broken, I think. --enable-no_rtti Enable compilation without creation of C++ RTTI information in object files. @@ -283,11 +283,11 @@ The following options handle the kind of library you want to build. --enable-dmalloc Use the dmalloc memory debugger. Read more at www.letters.com/dmalloc/ - --enable-debug_info Add debug info to object files and + --enable-debug_info Add debug info to object files and executables for use with debuggers such as gdb (or its many frontends). - --enable-debug_flag Define __DEBUG__ and __WXDEBUG__ when + --enable-debug_flag Define __DEBUG__ and __WXDEBUG__ when compiling. This enable wxWindows' very useful internal debugging tricks (such as automatically reporting illegal calls) @@ -307,19 +307,19 @@ drastically reduced by removing features from wxWindows that are not used in your program. The most relevant such features are - --without-libpng Disables PNG image format code. + --without-libpng Disables PNG image format code. - --without-libjpeg Disables JPEG image format code. + --without-libjpeg Disables JPEG image format code. - --disable-pnm Disables PNM image format code. + --disable-pnm Disables PNM image format code. - --disable-gif Disables GIF image format code. + --disable-gif Disables GIF image format code. - --disable-pcx Disables PCX image format code. + --disable-pcx Disables PCX image format code. --without-odbc Disables ODBC code. - --disable-resources Disables the use of *.wxr type + --disable-resources Disables the use of *.wxr type resources. --disable-threads Disables threads. Will also @@ -381,7 +381,7 @@ You can remove any traces of wxWindows by typing If you want to save disk space by removing unnecessary object-files: - make clean + make clean in the various directories will do the work for you. @@ -420,6 +420,5 @@ and configure before you can type make. In the hope that it will be useful, - Robert Roebling - - + Robert Roebling + diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt index 69fd183db0..b2bcac4c7a 100644 --- a/docs/gtk/readme.txt +++ b/docs/gtk/readme.txt @@ -1,22 +1,19 @@ Welcome to wxWindows/Gtk 2.1.13 -you have downloaded version 2.1 of the GTK+ 1.2 port of +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. -Nonetheless, beware that major changes can happen before +Nonetheless, beware that minor changes can happen before a final release. wxWindows no longer supports GTK 1.0 (as did some early snapshots) so that you will need GTK 1.2 when using it. - -Beginning with snapshot 9, wxWindows uses a completely -new make file system on Unix which no longer uses the -various GNU tools and I hope that I'll never again have -to write any more makefiles. +GTK 1.2.6 is recommended although many programs will work +with GTK 1.2.3 onwards. More information is available from my homepage at: @@ -56,6 +53,8 @@ Please send problems concerning installation, feature requests, bug reports or comments to the wxWindows users list. Information on how to subscribe is available from my homepage. +Do NOT send any comments directly to me. + wxWindows/Gtk doesn't come with any guarantee whatsoever. It might crash your harddisk or destroy your monitor. It doesn't claim to be suitable for any special or general purpose. diff --git a/docs/gtk/todo.txt b/docs/gtk/todo.txt index 58c4352b09..537b10ccfe 100644 --- a/docs/gtk/todo.txt +++ b/docs/gtk/todo.txt @@ -1,7 +1,7 @@ -------------------- High priority --------------------- -More testing of Unicode support. +Finish and extend wxPlotWindow. Improve, update translations. Install *.mo files somewehere. @@ -14,14 +14,17 @@ Show accelerator control labels and actually implement them Right aligned checkboxes: focus highlighting is wrong, tooltips can't be set can't be set -OwnerDraw for wxListCtrl and others +More testing of Unicode support. -> Postponed. +OwnerDraw for wxListCtrl and others + -> Hardly necessary. + Implement wxPalette - -> I never understood that. Postponed. + -> Postponed. Implement different visuals and displays - -> I never understood that. Postponed. + -> I cannot test this. Postponed. Cooperation with Qt -> Would be nice. diff --git a/include/wx/dnd.h b/include/wx/dnd.h index 6233f1525a..23530a666d 100644 --- a/include/wx/dnd.h +++ b/include/wx/dnd.h @@ -12,6 +12,10 @@ #ifndef _WX_DND_H_BASE_ #define _WX_DND_H_BASE_ +#ifdef __GNUG__ + #pragma interface "dndbase.h" +#endif + #include "wx/defs.h" #if wxUSE_DRAG_AND_DROP diff --git a/include/wx/geometry.h b/include/wx/geometry.h index e200863417..d0e3042401 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -16,6 +16,11 @@ #pragma interface "geometry.h" #endif +#include "wx/defs.h" +#include "wx/utils.h" +#include "wx/gdicmn.h" +#include + #ifdef __WXMSW__ #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c ) #elif defined( __WXMAC__ ) @@ -411,8 +416,8 @@ wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n) ; inline wxPoint2DInt::wxPoint2DInt() { - m_x = 0.0 ; - m_y = 0.0 ; + m_x = 0 ; + m_y = 0 ; } inline wxPoint2DInt::wxPoint2DInt( wxInt32 x , wxInt32 y ) @@ -453,8 +458,8 @@ inline wxDouble wxPoint2DInt::GetVectorLength() inline void wxPoint2DInt::SetVectorLength( wxDouble length ) { wxDouble before = GetVectorLength() ; - m_x *= length / before ; - m_y *= length / before ; + m_x = (wxInt32)(m_x * length / before) ; + m_y = (wxInt32)(m_y * length / before) ; } inline void wxPoint2DInt::SetPolarCoordinates( wxInt32 angle , wxInt32 length ) ; diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index a9bf6a29bc..41b350b38e 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -12,6 +12,10 @@ #ifndef _WX_LISTCTRL_H_BASE_ #define _WX_LISTCTRL_H_BASE_ +#ifdef __GNUG__ + #pragma interface "listctrlbase.h" +#endif + // ---------------------------------------------------------------------------- // types // ---------------------------------------------------------------------------- diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index 02f38a74b0..d1e04f8104 100644 --- a/include/wx/spinbutt.h +++ b/include/wx/spinbutt.h @@ -13,8 +13,7 @@ #define _WX_SPINBUTT_H_BASE_ #ifdef __GNUG__ -#pragma interface "spinbutbase.h" -#pragma implementation "spinbutbase.h" + #pragma interface "spinbutbase.h" #endif // ---------------------------------------------------------------------------- diff --git a/src/common/dndcmn.cpp b/src/common/dndcmn.cpp new file mode 100644 index 0000000000..9982565683 --- /dev/null +++ b/src/common/dndcmn.cpp @@ -0,0 +1,27 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: common/dndcmn.cpp +// Author: Robert Roebling +// Modified by: +// Created: 19.10.99 +// RCS-ID: $Id$ +// Copyright: (c) wxWindows Team +// Licence: wxWindows license +/////////////////////////////////////////////////////////////////////////////// + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#ifdef __GNUG__ + #pragma implementation "dndbase.h" +#endif + +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#include "wx/dnd.h" + +// Not much to do here, really, but GNU need this file. diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 098346f76a..f5afd68151 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -8,7 +8,8 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "listctrl.h" + #pragma implementation "listctrl.h" + #pragma implementation "listctrlbase.h" #endif // For compilers that support precompilation, includes "wx.h". diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index 140ff789ad..2a91143d97 100644 --- a/src/generic/panelg.cpp +++ b/src/generic/panelg.cpp @@ -274,6 +274,7 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event ) } //else: the child manages its focus itself + event.Skip( FALSE ); return; } diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index f1b6bf43e6..272530603b 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -8,7 +8,7 @@ /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "dnd.h" + #pragma implementation "dnd.h" #endif #include "wx/dnd.h" diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index 6da90d25b5..38f4d4c28a 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -9,7 +9,8 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "spinbutt.h" + #pragma implementation "spinbutt.h" + #pragma implementation "spinbutbase.h" #endif #include "wx/spinbutt.h" diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index f1b6bf43e6..272530603b 100644 --- a/src/gtk1/dnd.cpp +++ b/src/gtk1/dnd.cpp @@ -8,7 +8,7 @@ /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "dnd.h" + #pragma implementation "dnd.h" #endif #include "wx/dnd.h" diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp index 6da90d25b5..38f4d4c28a 100644 --- a/src/gtk1/spinbutt.cpp +++ b/src/gtk1/spinbutt.cpp @@ -9,7 +9,8 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "spinbutt.h" + #pragma implementation "spinbutt.h" + #pragma implementation "spinbutbase.h" #endif #include "wx/spinbutt.h"