From e46286351dbfa7ae98e8341e4fc328b134601e87 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 2 Aug 1999 19:06:23 +0000 Subject: [PATCH] Minor changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure.in | 11 +---- distrib/gtk/README.txt | 88 ++++++++++++++++++++++++++++++-------- distrib/gtk/copy_src | 71 +++++++++++------------------- distrib/motif/copy_src | 15 +------ docs/latex/wx/spinbutt.tex | 4 +- docs/latex/wx/treectrl.tex | 2 +- include/wx/caret.h | 4 ++ include/wx/generic/caret.h | 36 ++++++++-------- samples/caret/caret.cpp | 12 ------ src/generic/caret.cpp | 14 +++++- src/msw/Makefile.am | 4 +- src/unix/threadpsx.cpp | 10 ++++- utils/wxPython/README.txt | 3 +- 13 files changed, 147 insertions(+), 127 deletions(-) diff --git a/configure.in b/configure.in index ff1f4e8315..f18379995c 100644 --- a/configure.in +++ b/configure.in @@ -2148,7 +2148,7 @@ if test "$wxUSE_GUI" = "yes"; then dnl TODO some samples are never built so far: dnl mfc, nativdlg, oleauto, ownerdrw, proplist SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \ - forty fractal image richedit wxpoem" + forty fractal image wxpoem" fi dnl for convenience, sort the files to build in alphabetical order @@ -2262,29 +2262,20 @@ dnl samples/Makefile samples/minimal/Makefile samples/help/Makefile samples/image/Makefile samples/internat/Makefile - samples/joytest/Makefile samples/layout/Makefile samples/listctrl/Makefile samples/mdi/Makefile samples/memcheck/Makefile - samples/mfc/Makefile samples/minifram/Makefile samples/minimal/Makefile - samples/nativdlg/Makefile samples/notebook/Makefile - samples/oleauto/Makefile - samples/ownerdrw/Makefile samples/png/Makefile samples/printing/Makefile samples/proplist/Makefile - samples/regtest/Makefile samples/resource/Makefile - samples/richedit/Makefile samples/sashtest/Makefile samples/scroll/Makefile samples/splitter/Makefile - samples/tab/Makefile - samples/taskbar/Makefile samples/text/Makefile samples/thread/Makefile samples/toolbar/Makefile diff --git a/distrib/gtk/README.txt b/distrib/gtk/README.txt index 5f4af286bc..93ed8e2df4 100644 --- a/distrib/gtk/README.txt +++ b/distrib/gtk/README.txt @@ -23,6 +23,7 @@ the help file. To help you save disk space I'm now using Microsoft's HTML Help format. If your system doesn't know what to do with the help file, you can install the HTML Help Viewer as part of IE 4+, NT Service Pack 4+, or the HTML Workshop at + http://msdn.microsoft.com/workshop/author/htmlhelp/download.asp. @@ -44,6 +45,57 @@ Or you can send mail directly to the list using this address: ---------------------------------------------------------------------- +What's new in 2.1b2 +-------------------- + +Added the missing wxWindow.GetUpdateRegion() method. + +Made a new change in SWIG (update your patches everybody) that +provides a fix for global shadow objects that get an exception in +their __del__ when their extension module has already been deleted. +It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about +line 496 if you want to do it by hand. + +It is now possible to run through MainLoop more than once in any one +process. The cleanup that used to happen as MainLoop completed (and +prevented it from running again) has been delayed until the wxc module +is being unloaded by Python. + +I fixed a bunch of stuff in the C++ version of wxGrid so it wouldn't +make wxPython look bad. + +wxWindow.PopupMenu() now takes a wxPoint instead of x,y. Added +wxWindow.PopupMenuXY to be consistent with some other methods. + +Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace. + +You can now provide your own app.MainLoop method. See +wxPython/demo/demoMainLoop.py for an example and some explaination. + +Got the in-place-edit for the wxTreeCtrl fixed and added some demo +code to show how to use it. + +Put the wxIcon constructor back in for GTK as it now has one that +matches MSW's. + +Added wxGrid.GetCells + +Added wxSystemSettings static methods as functions with names like +wxSystemSettings_GetSystemColour. + +Removed wxPyMenu since using menu callbacks have been depreciated in +wxWindows. Use wxMenu and events instead. + +Added alternate wxBitmap constructor (for MSW only) as + wxBitmapFromData(data, type, width, height, depth = 1) + +Added a helper function named wxPyTypeCast that can convert shadow +objects of one type into shadow objects of another type. (Like doing +a down-cast.) See the implementation in wx.py for some docs. + + + + What's new in 2.1b1 -------------------- @@ -101,6 +153,9 @@ wxGIFHandler and wxBMPHandler. Added new methods to wxTextCtrl. +Fixed some problems with how SWIG was wrapping some wxTreeCtrl +methods. + What's new in 2.0b8 @@ -137,7 +192,7 @@ with the 2.0 version of wxWindows. I have finally started documenting wxPython. There are several pages in the wxWindows documentation tree specifically about wxPython, and I -have added notes within the class references about where wxPython +have added notes within the class references about where and how wxPython diverges from wxWindows. Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a @@ -195,7 +250,6 @@ down a nasty DECREF bug. Okay so I have to confess that it was just a DSM (Dumb Stupid Mistake) on my part but it was nasty none the less because the behavior was so different on different platforms. - The dynamicly loaded module on Solaris is still segfaulting, so it must have been a different issue all along... @@ -215,6 +269,8 @@ version segfault shortly after starting up. 3. Varioius bug fixes, enhancements, etc. +---------------------------------------------------------------------- + Build Instructions @@ -230,8 +286,8 @@ I added a few minor features to SWIG to control some of the code generation. If you want to playaround with this the patches are in wxPython/SWIG.patches and they should be applied to the 1.1p5 version of SWIG. These new patches are documented at -http://starship.skyport.net/crew/robind/python/#swig, and they should -also end up in the 1.2 version of SWIG. +http://starship.skyport.net/crew/robind/#swig, and they should also +end up in the 1.2 version of SWIG. wxPython is organized as a Python package. This means that the directory containing the results of the build process should be a @@ -262,23 +318,24 @@ above. 5. If it builds successfully, congratulations! Move on to the next step. If not then you can try mailing me for help. Also, I will always have a pre-built win32 version of this extension module at -http://starship.skyport.net/crew/robind/python. +http://alldunn.com/wxPython/. -6. Change to the $(WXWIN)/utils/wxPython/tests directory. +6. Change to the $(WXWIN)/utils/wxPython/demo directory. -7. Try executing the test programs. Note that some of these print -diagnositc or test info to standard output, so they will require the -console version of python. For example: +7. Try executing the demo program. For example: - python test1.py + python demo.py -To run them without requiring a console, you can use the pythonw.exe +To run it without requiring a console, you can use the pythonw.exe version of Python either from the command line or from a shortcut. Unix ---- +0. I configure wxWindows like this, YMMV: + +./configure --with-gtk --disable-shared --enable-threads --disable-unicode 1. Change into the $(WXWIN)/utils/wxPython/src directory. @@ -307,14 +364,11 @@ module: 5. Change to the $(WXWIN)/utils/wxPython/tests directory. -6. Try executing the test programs. For example: +6. Try executing the demo program. For example: - python test1.py - - ------------------------- -10/20/1998 + python demo.py +---------------- Robin Dunn robin@alldunn.com diff --git a/distrib/gtk/copy_src b/distrib/gtk/copy_src index 2de6a92898..915369398b 100755 --- a/distrib/gtk/copy_src +++ b/distrib/gtk/copy_src @@ -148,6 +148,18 @@ cp *.c ~/wxgtk_dist/wxGTK/src/gtk cp *.cpp ~/wxgtk_dist/wxGTK/src/gtk cd .. +cd msw +mkdir ~/wxgtk_dist/wxGTK/src/msw +cp Makefile.am ~/wxgtk_dist/wxGTK/src/msw +cp Makefile.in ~/wxgtk_dist/wxGTK/src/msw +cd .. + +cd motif +mkdir ~/wxgtk_dist/wxGTK/src/motif +cp Makefile.am ~/wxgtk_dist/wxGTK/src/motif +cp Makefile.in ~/wxgtk_dist/wxGTK/src/motif +cd .. + cd common mkdir ~/wxgtk_dist/wxGTK/src/common cp glob.inc ~/wxgtk_dist/wxGTK/src/common @@ -197,9 +209,7 @@ cd .. cd jpeg mkdir ~/wxgtk_dist/wxGTK/src/jpeg cp * ~/wxgtk_dist/wxGTK/src/jpeg -cd .. - -cd .. +cd ../.. echo Utils dir.. @@ -292,10 +302,6 @@ cp ./lib/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/lib mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/lib/sizers cp ./lib/sizers/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/lib/sizers -mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/tests -cp ./tests/README.txt ~/wxgtk_dist/wxGTK/utils/wxPython/tests -cp ./tests/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/tests - mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/demo cp ./demo/README.txt ~/wxgtk_dist/wxGTK/utils/wxPython/demo cp ./demo/*.py ~/wxgtk_dist/wxGTK/utils/wxPython/demo @@ -303,26 +309,8 @@ cp ./demo/*.pyc ~/wxgtk_dist/wxGTK/utils/wxPython/demo mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/demo/bitmaps cp ./demo/bitmaps/* ~/wxgtk_dist/wxGTK/utils/wxPython/demo/bitmaps -mkdir ~/wxgtk_dist/wxGTK/utils/wxPython/tests/bitmaps -cp ./tests/bitmaps/* ~/wxgtk_dist/wxGTK/utils/wxPython/tests/bitmaps -cd .. - -echo wxOLE.. - -cd wxOLE -mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE -mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE/gtk -cp ./gtk/wxole.* ~/wxgtk_dist/wxGTK/utils/wxOLE/gtk -mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE/samples -mkdir ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet -cp ./samples/servlet/Makefile ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet -cp ./samples/servlet/*.xpm ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet -cp ./samples/servlet/*.cpp ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet -cp ./samples/servlet/*.gnorba ~/wxgtk_dist/wxGTK/utils/wxOLE/samples/servlet - cd ../.. - echo Samples dir.. cd samples @@ -404,16 +392,17 @@ cp *.h ~/wxgtk_dist/wxGTK/samples/db cp *.xpm ~/wxgtk_dist/wxGTK/samples/db cd .. -echo DDE sample.. - -cd dde -mkdir ~/wxgtk_dist/wxGTK/samples/dde -cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dde -cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dde -cp *.cpp ~/wxgtk_dist/wxGTK/samples/dde -cp *.h ~/wxgtk_dist/wxGTK/samples/dde -cp *.xpm ~/wxgtk_dist/wxGTK/samples/dde -cd .. +#echo DDE sample.. +# +#cd dde +#mkdir ~/wxgtk_dist/wxGTK/samples/dde +#cp Makefile.am ~/wxgtk_dist/wxGTK/samples/dde +#cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dde +#cp *.cpp ~/wxgtk_dist/wxGTK/samples/dde +#cp *.h ~/wxgtk_dist/wxGTK/samples/dde +#cp *.xpm ~/wxgtk_dist/wxGTK/samples/dde +#cd .. +# echo Dialogs sample.. @@ -726,16 +715,6 @@ cp Makefile.in ~/wxgtk_dist/wxGTK/samples/splitter cp *.cpp ~/wxgtk_dist/wxGTK/samples/splitter cd .. -echo Tab sample.. - -cd tab -mkdir ~/wxgtk_dist/wxGTK/samples/tab -cp Makefile.am ~/wxgtk_dist/wxGTK/samples/tab -cp Makefile.in ~/wxgtk_dist/wxGTK/samples/tab -cp *.cpp ~/wxgtk_dist/wxGTK/samples/tab -cp *.h ~/wxgtk_dist/wxGTK/samples/tab -cd .. - echo Text sample.. cd text @@ -832,4 +811,4 @@ cp README.txt ~/wxgtk_dist/wxGTK/utils/wxPython cp Setup ~/wxgtk_dist/wxGTK/utils/wxPython/src cd ~/wxgtk_dist -tar ch wxGTK | gzip -f9 > wxGTK-2.1.0-b7b.tgz +tar ch wxGTK | gzip -f9 > wxGTK-2.1.0-b8b.tgz diff --git a/distrib/motif/copy_src b/distrib/motif/copy_src index 6276487c01..c941a993a6 100755 --- a/distrib/motif/copy_src +++ b/distrib/motif/copy_src @@ -289,17 +289,6 @@ cp *.h ~/wxmotif_dist/wxMotif/samples/db cp *.xpm ~/wxmotif_dist/wxMotif/samples/db cd .. -echo DDE sample.. - -cd dde -mkdir ~/wxmotif_dist/wxMotif/samples/dde -cp Makefile.am ~/wxmotif_dist/wxMotif/samples/dde -cp Makefile.in ~/wxmotif_dist/wxMotif/samples/dde -cp *.cpp ~/wxmotif_dist/wxMotif/samples/dde -cp *.h ~/wxmotif_dist/wxMotif/samples/dde -cp *.xpm ~/wxmotif_dist/wxMotif/samples/dde -cd .. - echo Dialogs sample.. cd dialogs @@ -611,8 +600,6 @@ cp Makefile.in ~/wxmotif_dist/wxMotif/samples/splitter cp *.cpp ~/wxmotif_dist/wxMotif/samples/splitter cd .. -echo Tab sample.. - cd tab mkdir ~/wxmotif_dist/wxMotif/samples/tab cp Makefile.am ~/wxmotif_dist/wxMotif/samples/tab @@ -711,4 +698,4 @@ cp *.xpm ~/wxmotif_dist/wxMotif/samples/wxsocket cd ../.. cd ~/wxmotif_dist -tar ch wxMotif | gzip -f9 > wxMotif-2.1.0-b7.tgz +tar ch wxMotif | gzip -f9 > wxMotif-2.1.0-b8.tgz diff --git a/docs/latex/wx/spinbutt.tex b/docs/latex/wx/spinbutt.tex index d2b3b3332a..cbd1263151 100644 --- a/docs/latex/wx/spinbutt.tex +++ b/docs/latex/wx/spinbutt.tex @@ -34,8 +34,8 @@ functions that take a \helpref{wxScrollEvent}{wxscrollevent} argument: \twocolwidtha{7cm} \begin{twocollist} \twocolitem{{\bf EVT\_SPIN(id, func)}}{Catch all scroll commands.} -\twocolitem{{\bf EVT\_SPIN\_UP(id, func)}}{Catch up (or left) commands.} -\twocolitem{{\bf EVT\_SPIN\_DOWN(id, func)}}{Catch down (or right) commands.} +\twocolitem{{\bf EVT\_SPIN\_UP(id, func)}}{Catch up (or left) commands. Win32 only. } +\twocolitem{{\bf EVT\_SPIN\_DOWN(id, func)}}{Catch down (or right) commands. Win32 only. } \twocolitem{{\bf EVT\_COMMAND\_TOP(id, func)}}{Catch a command to put the scroll thumb at the maximum position.} \twocolitem{{\bf EVT\_COMMAND\_SCROLL(id, func)}}{Catch all scroll commands.} \twocolitem{{\bf EVT\_COMMAND\_TOP(id, func)}}{Catch a command to put the scroll thumb at the maximum position.} diff --git a/docs/latex/wx/treectrl.tex b/docs/latex/wx/treectrl.tex index 6e5b52fb27..47f182a800 100644 --- a/docs/latex/wx/treectrl.tex +++ b/docs/latex/wx/treectrl.tex @@ -21,7 +21,7 @@ To intercept events from a tree control, use the event table macros described in \twocolwidtha{5cm} \begin{twocollist}\itemsep=0pt \twocolitem{\windowstyle{wxTR\_HAS\_BUTTONS}}{Use this style to show + and - buttons to the -left of parent items.} +left of parent items. Win32 only. } \twocolitem{\windowstyle{wxTR\_EDIT\_LABELS}}{Use this style if you wish the user to be able to edit labels in the tree control.} \twocolitem{\windowstyle{wxTR\_MULTIPLE}}{Use this style to allow the user to diff --git a/include/wx/caret.h b/include/wx/caret.h index bdc4279c56..7ab4acc752 100644 --- a/include/wx/caret.h +++ b/include/wx/caret.h @@ -12,6 +12,10 @@ #ifndef _WX_CARET_H_BASE_ #define _WX_CARET_H_BASE_ +#ifdef __GNUG__ +#pragma interface "caret.h" +#endif + // --------------------------------------------------------------------------- // forward declarations // --------------------------------------------------------------------------- diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h index 93df894ea6..ffb95c3422 100644 --- a/include/wx/generic/caret.h +++ b/include/wx/generic/caret.h @@ -9,15 +9,27 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#if 0 //def __GNUG__ - #pragma implementation "caret.h" -#endif - #ifndef _WX_CARET_H_ #define _WX_CARET_H_ +#ifdef __GNUG__ +#pragma interface "caret.h" +#endif + #include "wx/timer.h" +class wxCaret; + +class wxCaretTimer : public wxTimer +{ +public: + wxCaretTimer(wxCaret *caret); + virtual void Notify(); + +private: + wxCaret *m_caret; +}; + class wxCaret : public wxCaretBase { public: @@ -46,23 +58,13 @@ protected: // draw the caret on the given DC void DoDraw(wxDC *dc); - + private: // GTK specific initialization void InitGeneric(); - class CaretTimer : public wxTimer - { - public: - CaretTimer(wxCaret *caret) { m_caret = caret; } - - virtual void Notify() { m_caret->Blink(); } - - private: - wxCaret *m_caret; - } m_timer; - - bool m_blinkedOut; // TRUE => caret hidden right now + wxCaretTimer m_timer; + bool m_blinkedOut; // TRUE => caret hidden right now }; #endif // _WX_CARET_H_ diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp index 2ecaf096a1..5e41c55f79 100644 --- a/samples/caret/caret.cpp +++ b/samples/caret/caret.cpp @@ -9,18 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "caret.cpp" - #pragma interface "caret.cpp" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp index 21f1231a64..2620630941 100644 --- a/src/generic/caret.cpp +++ b/src/generic/caret.cpp @@ -17,8 +17,8 @@ // headers // ---------------------------------------------------------------------------- -#if 0 //def __GNUG__ - #pragma implementation "caret.h" +#ifdef __GNUG__ +#pragma implementation "caret.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -46,6 +46,16 @@ static int gs_blinkTime = 500; // in milliseconds // implementation // ============================================================================ +wxCaretTimer::wxCaretTimer(wxCaret *caret) +{ + m_caret = caret; +} + +void wxCaretTimer::Notify() +{ + m_caret->Blink(); +} + // ---------------------------------------------------------------------------- // wxCaret static functions and data // ---------------------------------------------------------------------------- diff --git a/src/msw/Makefile.am b/src/msw/Makefile.am index 3fd1fc5fbb..6bc505d2d3 100644 --- a/src/msw/Makefile.am +++ b/src/msw/Makefile.am @@ -4,8 +4,8 @@ ## ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = 1.3 -# no-dependencies +AUTOMAKE_OPTIONS = +# 1.3 no-dependencies SUFFIXES = .cpp .c diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp index 75b3bff757..eee36b4d3a 100644 --- a/src/unix/threadpsx.cpp +++ b/src/unix/threadpsx.cpp @@ -100,12 +100,18 @@ public: wxMutex::wxMutex() { + p_internal = new wxMutexInternal; + +#if 0 + /* I don't know where this function is supposed to exist, + and NP actually means non-portable, RR. */ pthread_mutexattr_t attr_type; - pthread_mutexattr_settype( &attr_type, PTHREAD_MUTEX_FAST_NP ); - p_internal = new wxMutexInternal; pthread_mutex_init( &(p_internal->p_mutex), (const pthread_mutexattr_t*) &attr_type ); +#else + pthread_mutex_init( &(p_internal->p_mutex), (const pthread_mutexattr_t*) NULL ); +#endif m_locked = 0; } diff --git a/utils/wxPython/README.txt b/utils/wxPython/README.txt index 054a77bdc8..a1601aa61d 100644 --- a/utils/wxPython/README.txt +++ b/utils/wxPython/README.txt @@ -335,8 +335,7 @@ Unix ---- 0. I configure wxWindows like this, YMMV: -./configure --with-gtk --without-shared --with-threads --without-unicode --with-libjpeg - +./configure --with-gtk --disable-shared --enable-threads --disable-unicode 1. Change into the $(WXWIN)/utils/wxPython/src directory. -- 2.45.2