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

No longer building the C++ version of the OGL lib

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-04-20 21:44:36 +00:00
parent 4a40657bc8
commit 05ccd26a17
2 changed files with 16 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
wxPython/docs/MigrationGuide.txt
View File

@@ -339,7 +339,7 @@ Building, Extending and Embedding wxPython
wxPython's setup.py script now expects to use existing libraries for wxPython's setup.py script now expects to use existing libraries for
the contribs (gizmos, stc, xrc, etc.) rather than building local the contribs (gizmos, stc, xrc, etc.) rather than building local
copies of them. If you build your own copies of wxPython please be copies of them. If you build your own copies of wxPython please be
aware that you now need to also build the ogl, stc, xrc, and gizmos aware that you now need to also build the stc, xrc, animate and gizmos
libraries in addition to the main wx lib. libraries in addition to the main wx lib.
The wxPython.h and other header files are now in The wxPython.h and other header files are now in
@@ -691,19 +691,22 @@ OGL is dead! LONG LIVE OGL!
**[Changed in 2.5.2.x]** **[Changed in 2.5.2.x]**
The wx.ogl module has been deprecated in favor of the new Python port The wx.ogl module was deprecated in version 2.5.2 in favor of the new
of the OGL library located at wx.lib.ogl contributed by Pierre Hj<48>lm. Python port of the OGL library located at wx.lib.ogl contributed by
This will hopefully greatly extend the life of OGL within wxPython by Pierre Hj<48>lm. Starting in version 2.5.5 the old ogl is no longer
making it more easily maintainable and less prone to getting rusty as being built in the distributed binaries, however the source code is
there seems to be less and less interest in maintaining the C++ still in the source tree so people can built it themselves if desired.
version.
The reason this changes was done was to greatly extend the life of OGL
within wxPython by making it more easily maintainable and less prone
to getting rusty as there seems to be less and less interest in
maintaining the C++ version.
There are only a few known compatibility issues at this time. First There are only a few known compatibility issues at this time. First
is that the ogl.DrawnShape has not been reimplemented yet. Next is the is the location of OGL. The old version was located in the
location of OGL. The deprecated version is located in the wx.ogl wx.ogl module, and the new version is in the wx.lib.ogl package. So
module, and the new version is in the wx.lib.ogl package. So this this just means that to start using the new version you need to adjust
just means that to start using the new version you need to adjust your your imports. So if your code currently has something like this::
imports. So if your code currently has something like this::
import wx import wx
import wx.ogl as ogl import wx.ogl as ogl

146
wxPython/wxPython/ogl.py
View File

@@ -1,146 +0,0 @@
## This file reverse renames symbols in the wx package to give
## them their wx prefix again, for backwards compatibility.
##
## Generated by BuildRenamers in config.py
# This silly stuff here is so the wxPython.wx module doesn't conflict
# with the wx package. We need to import modules from the wx package
# here, then we'll put the wxPython.wx entry back in sys.modules.
import sys
_wx = None
if sys.modules.has_key('wxPython.wx'):
_wx = sys.modules['wxPython.wx']
del sys.modules['wxPython.wx']
import wx.ogl
sys.modules['wxPython.wx'] = _wx
del sys, _wx
# Now assign all the reverse-renamed names:
wxShapeRegion = wx.ogl.ShapeRegion
wxShapeRegionPtr = wx.ogl.ShapeRegionPtr
wxAttachmentPoint = wx.ogl.AttachmentPoint
wxAttachmentPointPtr = wx.ogl.AttachmentPointPtr
wxPyShapeEvtHandler = wx.ogl.PyShapeEvtHandler
wxPyShapeEvtHandlerPtr = wx.ogl.PyShapeEvtHandlerPtr
wxPyShape = wx.ogl.PyShape
wxPyShapePtr = wx.ogl.PyShapePtr
oglMETAFLAGS_OUTLINE = wx.ogl.oglMETAFLAGS_OUTLINE
oglMETAFLAGS_ATTACHMENTS = wx.ogl.oglMETAFLAGS_ATTACHMENTS
wxPseudoMetaFile = wx.ogl.PseudoMetaFile
wxPseudoMetaFilePtr = wx.ogl.PseudoMetaFilePtr
wxPyRectangleShape = wx.ogl.PyRectangleShape
wxPyRectangleShapePtr = wx.ogl.PyRectangleShapePtr
wxPyControlPoint = wx.ogl.PyControlPoint
wxPyControlPointPtr = wx.ogl.PyControlPointPtr
wxPyBitmapShape = wx.ogl.PyBitmapShape
wxPyBitmapShapePtr = wx.ogl.PyBitmapShapePtr
wxPyDrawnShape = wx.ogl.PyDrawnShape
wxPyDrawnShapePtr = wx.ogl.PyDrawnShapePtr
wxOGLConstraint = wx.ogl.OGLConstraint
wxOGLConstraintPtr = wx.ogl.OGLConstraintPtr
wxPyCompositeShape = wx.ogl.PyCompositeShape
wxPyCompositeShapePtr = wx.ogl.PyCompositeShapePtr
wxPyDividedShape = wx.ogl.PyDividedShape
wxPyDividedShapePtr = wx.ogl.PyDividedShapePtr
wxPyDivisionShape = wx.ogl.PyDivisionShape
wxPyDivisionShapePtr = wx.ogl.PyDivisionShapePtr
wxPyEllipseShape = wx.ogl.PyEllipseShape
wxPyEllipseShapePtr = wx.ogl.PyEllipseShapePtr
wxPyCircleShape = wx.ogl.PyCircleShape
wxPyCircleShapePtr = wx.ogl.PyCircleShapePtr
wxArrowHead = wx.ogl.ArrowHead
wxArrowHeadPtr = wx.ogl.ArrowHeadPtr
wxPyLineShape = wx.ogl.PyLineShape
wxPyLineShapePtr = wx.ogl.PyLineShapePtr
wxPyPolygonShape = wx.ogl.PyPolygonShape
wxPyPolygonShapePtr = wx.ogl.PyPolygonShapePtr
wxPyTextShape = wx.ogl.PyTextShape
wxPyTextShapePtr = wx.ogl.PyTextShapePtr
wxDiagram = wx.ogl.Diagram
wxDiagramPtr = wx.ogl.DiagramPtr
wxPyShapeCanvas = wx.ogl.PyShapeCanvas
wxPyShapeCanvasPtr = wx.ogl.PyShapeCanvasPtr
KEY_SHIFT = wx.ogl.KEY_SHIFT
KEY_CTRL = wx.ogl.KEY_CTRL
ARROW_NONE = wx.ogl.ARROW_NONE
ARROW_END = wx.ogl.ARROW_END
ARROW_BOTH = wx.ogl.ARROW_BOTH
ARROW_MIDDLE = wx.ogl.ARROW_MIDDLE
ARROW_START = wx.ogl.ARROW_START
ARROW_HOLLOW_CIRCLE = wx.ogl.ARROW_HOLLOW_CIRCLE
ARROW_FILLED_CIRCLE = wx.ogl.ARROW_FILLED_CIRCLE
ARROW_ARROW = wx.ogl.ARROW_ARROW
ARROW_SINGLE_OBLIQUE = wx.ogl.ARROW_SINGLE_OBLIQUE
ARROW_DOUBLE_OBLIQUE = wx.ogl.ARROW_DOUBLE_OBLIQUE
ARROW_METAFILE = wx.ogl.ARROW_METAFILE
ARROW_POSITION_END = wx.ogl.ARROW_POSITION_END
ARROW_POSITION_START = wx.ogl.ARROW_POSITION_START
CONTROL_POINT_VERTICAL = wx.ogl.CONTROL_POINT_VERTICAL
CONTROL_POINT_HORIZONTAL = wx.ogl.CONTROL_POINT_HORIZONTAL
CONTROL_POINT_DIAGONAL = wx.ogl.CONTROL_POINT_DIAGONAL
CONTROL_POINT_ENDPOINT_TO = wx.ogl.CONTROL_POINT_ENDPOINT_TO
CONTROL_POINT_ENDPOINT_FROM = wx.ogl.CONTROL_POINT_ENDPOINT_FROM
CONTROL_POINT_LINE = wx.ogl.CONTROL_POINT_LINE
FORMAT_NONE = wx.ogl.FORMAT_NONE
FORMAT_CENTRE_HORIZ = wx.ogl.FORMAT_CENTRE_HORIZ
FORMAT_CENTRE_VERT = wx.ogl.FORMAT_CENTRE_VERT
FORMAT_SIZE_TO_CONTENTS = wx.ogl.FORMAT_SIZE_TO_CONTENTS
LINE_ALIGNMENT_HORIZ = wx.ogl.LINE_ALIGNMENT_HORIZ
LINE_ALIGNMENT_VERT = wx.ogl.LINE_ALIGNMENT_VERT
LINE_ALIGNMENT_TO_NEXT_HANDLE = wx.ogl.LINE_ALIGNMENT_TO_NEXT_HANDLE
LINE_ALIGNMENT_NONE = wx.ogl.LINE_ALIGNMENT_NONE
SHADOW_NONE = wx.ogl.SHADOW_NONE
SHADOW_LEFT = wx.ogl.SHADOW_LEFT
SHADOW_RIGHT = wx.ogl.SHADOW_RIGHT
OP_CLICK_LEFT = wx.ogl.OP_CLICK_LEFT
OP_CLICK_RIGHT = wx.ogl.OP_CLICK_RIGHT
OP_DRAG_LEFT = wx.ogl.OP_DRAG_LEFT
OP_DRAG_RIGHT = wx.ogl.OP_DRAG_RIGHT
OP_ALL = wx.ogl.OP_ALL
ATTACHMENT_MODE_NONE = wx.ogl.ATTACHMENT_MODE_NONE
ATTACHMENT_MODE_EDGE = wx.ogl.ATTACHMENT_MODE_EDGE
ATTACHMENT_MODE_BRANCHING = wx.ogl.ATTACHMENT_MODE_BRANCHING
BRANCHING_ATTACHMENT_NORMAL = wx.ogl.BRANCHING_ATTACHMENT_NORMAL
BRANCHING_ATTACHMENT_BLOB = wx.ogl.BRANCHING_ATTACHMENT_BLOB
gyCONSTRAINT_CENTRED_VERTICALLY = wx.ogl.gyCONSTRAINT_CENTRED_VERTICALLY
gyCONSTRAINT_CENTRED_HORIZONTALLY = wx.ogl.gyCONSTRAINT_CENTRED_HORIZONTALLY
gyCONSTRAINT_CENTRED_BOTH = wx.ogl.gyCONSTRAINT_CENTRED_BOTH
gyCONSTRAINT_LEFT_OF = wx.ogl.gyCONSTRAINT_LEFT_OF
gyCONSTRAINT_RIGHT_OF = wx.ogl.gyCONSTRAINT_RIGHT_OF
gyCONSTRAINT_ABOVE = wx.ogl.gyCONSTRAINT_ABOVE
gyCONSTRAINT_BELOW = wx.ogl.gyCONSTRAINT_BELOW
gyCONSTRAINT_ALIGNED_TOP = wx.ogl.gyCONSTRAINT_ALIGNED_TOP
gyCONSTRAINT_ALIGNED_BOTTOM = wx.ogl.gyCONSTRAINT_ALIGNED_BOTTOM
gyCONSTRAINT_ALIGNED_LEFT = wx.ogl.gyCONSTRAINT_ALIGNED_LEFT
gyCONSTRAINT_ALIGNED_RIGHT = wx.ogl.gyCONSTRAINT_ALIGNED_RIGHT
gyCONSTRAINT_MIDALIGNED_TOP = wx.ogl.gyCONSTRAINT_MIDALIGNED_TOP
gyCONSTRAINT_MIDALIGNED_BOTTOM = wx.ogl.gyCONSTRAINT_MIDALIGNED_BOTTOM
gyCONSTRAINT_MIDALIGNED_LEFT = wx.ogl.gyCONSTRAINT_MIDALIGNED_LEFT
gyCONSTRAINT_MIDALIGNED_RIGHT = wx.ogl.gyCONSTRAINT_MIDALIGNED_RIGHT
DIVISION_SIDE_NONE = wx.ogl.DIVISION_SIDE_NONE
DIVISION_SIDE_LEFT = wx.ogl.DIVISION_SIDE_LEFT
DIVISION_SIDE_TOP = wx.ogl.DIVISION_SIDE_TOP
DIVISION_SIDE_RIGHT = wx.ogl.DIVISION_SIDE_RIGHT
DIVISION_SIDE_BOTTOM = wx.ogl.DIVISION_SIDE_BOTTOM
wxOGLInitialize = wx.ogl.OGLInitialize
wxOGLCleanUp = wx.ogl.OGLCleanUp
wxShapeCanvas = wx.ogl.ShapeCanvas
wxShapeEvtHandler = wx.ogl.ShapeEvtHandler
wxShape = wx.ogl.Shape
wxRectangleShape = wx.ogl.RectangleShape
wxBitmapShape = wx.ogl.BitmapShape
wxDrawnShape = wx.ogl.DrawnShape
wxCompositeShape = wx.ogl.CompositeShape
wxDividedShape = wx.ogl.DividedShape
wxDivisionShape = wx.ogl.DivisionShape
wxEllipseShape = wx.ogl.EllipseShape
wxCircleShape = wx.ogl.CircleShape
wxLineShape = wx.ogl.LineShape
wxPolygonShape = wx.ogl.PolygonShape
wxTextShape = wx.ogl.TextShape
wxControlPoint = wx.ogl.ControlPoint