From 6431656829b94369e1a74a6197df5541aba382d4 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 10 Jun 2004 20:26:43 +0000 Subject: [PATCH] Some doc tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/docs/BUILD.html | 19 ++++++------------- wxPython/docs/BUILD.txt | 2 +- wxPython/docs/CHANGES.html | 2 +- wxPython/docs/CHANGES.txt | 2 +- wxPython/docs/MigrationGuide.html | 16 ++++++++-------- wxPython/docs/MigrationGuide.txt | 16 ++++++++-------- 6 files changed, 25 insertions(+), 32 deletions(-) diff --git a/wxPython/docs/BUILD.html b/wxPython/docs/BUILD.html index 72ed1bec7c..7158c4ebe8 100644 --- a/wxPython/docs/BUILD.html +++ b/wxPython/docs/BUILD.html @@ -239,20 +239,13 @@ you can do everything by hand as described below. But if you do work by hand and something doesn't seem to be working correctly please refer to the build scripts to see what may need to be done differently.

-

The *.btm files are for 4NT and the others are for bash. They are:

-
-

System Message: WARNING/2 (/home/work/projects/wx2.5/wxPython/docs/BUILD.txt, line 259); backlink

-Inline emphasis start-string without end-string.
-
-

.make/.make.btm Builds the main lib and the needed contribs +

The *.btm files are for 4NT and the others are for bash. They are:

+
+.make/.make.btm        Builds the main lib and the needed contribs
 .mymake/.mymake.btm    Builds just one lib, use by .make
-.makesetup.mk          A makefile that will copy and edit setup.h

-

-
System Message: ERROR/3 (/home/work/projects/wx2.5/wxPython/docs/BUILD.txt, line 264)

-Unexpected indentation.

-

-as needed for the different types of builds

-
+.makesetup.mk A makefile that will copy and edit setup.h + as needed for the different types of builds +

Okay. Here's what you've been waiting for, the instructions! Adapt accordingly if you are using the bash shell.

    diff --git a/wxPython/docs/BUILD.txt b/wxPython/docs/BUILD.txt index cce691ccc8..9cd5fdce91 100644 --- a/wxPython/docs/BUILD.txt +++ b/wxPython/docs/BUILD.txt @@ -256,7 +256,7 @@ by hand and something doesn't seem to be working correctly please refer to the build scripts to see what may need to be done differently. -The *.btm files are for 4NT and the others are for bash. They are: +The \*.btm files are for 4NT and the others are for bash. They are:: .make/.make.btm Builds the main lib and the needed contribs .mymake/.mymake.btm Builds just one lib, use by .make diff --git a/wxPython/docs/CHANGES.html b/wxPython/docs/CHANGES.html index 1ea6262572..33611c2b77 100644 --- a/wxPython/docs/CHANGES.html +++ b/wxPython/docs/CHANGES.html @@ -11,7 +11,7 @@

    Recent Changes for wxPython

    -

    2.5.2.0

    +

    2.5.2.1

    wx.ADJUST_MINSIZE is now the default behaviour for window items in sizers. This means that the item's GetMinSize and/or GetBestSize will be called when calculating layout and the return value from that will diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt index 9dbf304523..0b812f7ef5 100644 --- a/wxPython/docs/CHANGES.txt +++ b/wxPython/docs/CHANGES.txt @@ -1,7 +1,7 @@ Recent Changes for wxPython ===================================================================== -2.5.2.0 +2.5.2.1 ------- wx.ADJUST_MINSIZE is now the default behaviour for window items in diff --git a/wxPython/docs/MigrationGuide.html b/wxPython/docs/MigrationGuide.html index 23b6938f67..5d8c2f4158 100644 --- a/wxPython/docs/MigrationGuide.html +++ b/wxPython/docs/MigrationGuide.html @@ -46,7 +46,7 @@ yet.

    Also, you will probably not be able to do any kind of GUI or bitmap operation unless you first have created an app object, (even on Windows where most anything was possible before.)

    -

    [Changed in 2.5.2.0] All the Window and GDI (pen, bitmap, etc.) +

    [Changed in 2.5.2.x] All the Window and GDI (pen, bitmap, etc.) class constructors and also many toplevel functions and static methods will now check that a wx.App object has already been created and will raise a wx.PyNoAppError exception if not.

    @@ -156,7 +156,7 @@ EVT_MY_CUSTOM_EVENT = wx.PyEventBinder(myCustomEventType, 1)

    The second parameter is an integer in [0, 1, 2] that specifies the number of IDs that are needed to be passed to Connect.

    -

    [Changed in 2.5.2.0] There is also an Unbind method added to +

    [Changed in 2.5.2.x] There is also an Unbind method added to wx.EvtHandler that can be used to disconenct event handlers. It looks like this:

    @@ -227,7 +227,7 @@ just fine.

    New wx.DC Methods

    -

    [Changed in 2.5.2.0] In wxPython 2.5.1.5 there was a new +

    [Changed in 2.5.2.x] In wxPython 2.5.1.5 there was a new implementation of the wx.DC Draw and other methods that broke backwards compatibility in the name of consistency. That change has been reverted and the wx.DC Draw methods with 2.4 compatible @@ -375,10 +375,10 @@ library) has been added to C++ and wrapped for wxPython. It can also be used from XRC.

    You should not use AddWindow, AddSizer, AddSpacer (and similar for Insert, Prepend, and etc.) methods any longer. Just use Add and the -wrappers will figure out what to do. [Changed in 2.5.2.0] +wrappers will figure out what to do. [Changed in 2.5.2.x] AddWindow, AddSize, AddSpacer and etc. will now issue a DeprecationWarning.

    -

    [Changed in 2.5.2.0] wx.ADJUST_MINSIZE is now the default +

    [Changed in 2.5.2.x] wx.ADJUST_MINSIZE is now the default behaviour for window items in sizers. This means that the item's GetMinSize and/or GetBestSize will be called when calculating layout and the return value from that will be used for the minimum size used @@ -553,7 +553,7 @@ fully transparent.

    OGL is dead! LONG LIVE OGL!

    -

    [Changed in 2.5.2.0]

    +

    [Changed in 2.5.2.x]

    The wx.ogl module has been deprecated in favor of the new Python port of the OGL library located at wx.lib.ogl contributed by Pierre Hjälm. This will hopefully greatly extend the life of OGL within wxPython by @@ -703,10 +703,10 @@ functions in wxPython for parameters that are expecting an integer. If the object is not already an integer then it will be asked to convert itself to one. A similar conversion fragment is in place for parameters that expect floating point values.

    -

    [Changed in 2.5.2.0] The MaskedEditCtrl modules have been moved +

    [Changed in 2.5.2.x] The MaskedEditCtrl modules have been moved to their own sub-package, wx.lib.masked. See the docstrings and demo for changes in capabilities, usage, etc.

    -

    [Changed in 2.5.2.0] wx.MaskColour constructor has been deprecated +

    [Changed in 2.5.2.x] wx.MaskColour constructor has been deprecated and will raise a DeprecationWarning if used. The main wx.Mask constructor has been modified to be compatible with wx.MaskColour so you should use it instead.

    diff --git a/wxPython/docs/MigrationGuide.txt b/wxPython/docs/MigrationGuide.txt index ec3f973675..4f8bd7bed5 100644 --- a/wxPython/docs/MigrationGuide.txt +++ b/wxPython/docs/MigrationGuide.txt @@ -52,7 +52,7 @@ Also, you will probably not be able to do any kind of GUI or bitmap operation unless you first have created an app object, (even on Windows where most anything was possible before.) -**[Changed in 2.5.2.0]** All the Window and GDI (pen, bitmap, etc.) +**[Changed in 2.5.2.x]** All the Window and GDI (pen, bitmap, etc.) class constructors and also many toplevel functions and static methods will now check that a wx.App object has already been created and will raise a wx.PyNoAppError exception if not. @@ -176,7 +176,7 @@ Change it like so:: The second parameter is an integer in [0, 1, 2] that specifies the number of IDs that are needed to be passed to Connect. -**[Changed in 2.5.2.0]** There is also an Unbind method added to +**[Changed in 2.5.2.x]** There is also an Unbind method added to wx.EvtHandler that can be used to disconenct event handlers. It looks like this:: @@ -257,7 +257,7 @@ just fine. New wx.DC Methods ----------------- -**[Changed in 2.5.2.0]** In wxPython 2.5.1.5 there was a new +**[Changed in 2.5.2.x]** In wxPython 2.5.1.5 there was a new implementation of the wx.DC Draw and other methods that broke backwards compatibility in the name of consistency. That change has been reverted and the wx.DC Draw methods with 2.4 compatible @@ -423,11 +423,11 @@ be used from XRC. You should not use AddWindow, AddSizer, AddSpacer (and similar for Insert, Prepend, and etc.) methods any longer. Just use Add and the -wrappers will figure out what to do. **[Changed in 2.5.2.0]** +wrappers will figure out what to do. **[Changed in 2.5.2.x]** AddWindow, AddSize, AddSpacer and etc. will now issue a DeprecationWarning. -**[Changed in 2.5.2.0]** wx.ADJUST_MINSIZE is now the default +**[Changed in 2.5.2.x]** wx.ADJUST_MINSIZE is now the default behaviour for window items in sizers. This means that the item's GetMinSize and/or GetBestSize will be called when calculating layout and the return value from that will be used for the minimum size used @@ -624,7 +624,7 @@ following: OGL is dead! LONG LIVE OGL! --------------------------- -**[Changed in 2.5.2.0]** +**[Changed in 2.5.2.x]** The wx.ogl module has been deprecated in favor of the new Python port of the OGL library located at wx.lib.ogl contributed by Pierre Hjälm. @@ -791,11 +791,11 @@ If the object is not already an integer then it will be asked to convert itself to one. A similar conversion fragment is in place for parameters that expect floating point values. -**[Changed in 2.5.2.0]** The MaskedEditCtrl modules have been moved +**[Changed in 2.5.2.x]** The MaskedEditCtrl modules have been moved to their own sub-package, wx.lib.masked. See the docstrings and demo for changes in capabilities, usage, etc. -**[Changed in 2.5.2.0]** wx.MaskColour constructor has been deprecated +**[Changed in 2.5.2.x]** wx.MaskColour constructor has been deprecated and will raise a DeprecationWarning if used. The main wx.Mask constructor has been modified to be compatible with wx.MaskColour so you should use it instead. -- 2.45.2