In GetPath(), don't append separator if there's already one at the end

[wxWidgets.git] / wxPython / contrib / ogl / oglshapes2.py

diff --git a/wxPython/contrib/ogl/oglshapes2.py b/wxPython/contrib/ogl/oglshapes2.py
index ef744f8ed9d38d442dc9b50212f7e6e4db8a916c..25c6516237f8156357a1b0ed2fe701887afb8434 100644 (file)
--- a/wxPython/contrib/ogl/oglshapes2.py
+++ b/wxPython/contrib/ogl/oglshapes2.py
@@ -9,12 +9,16 @@ from windows import *
 
 from gdi import *
 
 
 from gdi import *
 

+from fonts import *
+

 from clip_dnd import *
 
 from events import *
 
 from streams import *
 
 from clip_dnd import *
 
 from events import *
 
 from streams import *
 

+from utils import *
+

 from mdi import *
 
 from frames import *
 from mdi import *
 
 from frames import *


@@ -39,8 +43,6 @@ from sizers import *
 
 from filesys import *
 
 
 from filesys import *
 

-from utils import *
-

 from oglbasic import *
 
 from oglshapes import *
 from oglbasic import *
 
 from oglshapes import *


@@ -143,6 +145,7 @@ class wxPyEllipseShape(wxPyEllipseShapePtr):
         self.this = apply(oglshapes2c.new_wxPyEllipseShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyEllipseShape)
         self.this = apply(oglshapes2c.new_wxPyEllipseShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyEllipseShape)

+        self._setOORInfo(self)

 
 
 
 
 
 


@@ -245,6 +248,7 @@ class wxPyCircleShape(wxPyCircleShapePtr):
         self.this = apply(oglshapes2c.new_wxPyCircleShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyCircleShape)
         self.this = apply(oglshapes2c.new_wxPyCircleShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyCircleShape)

+        self._setOORInfo(self)

 
 
 
 
 
 


@@ -533,6 +537,7 @@ class wxPyLineShape(wxPyLineShapePtr):
         self.this = apply(oglshapes2c.new_wxPyLineShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyLineShape)
         self.this = apply(oglshapes2c.new_wxPyLineShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyLineShape)

+        self._setOORInfo(self)

 
 
 
 
 
 


@@ -653,6 +658,7 @@ class wxPyPolygonShape(wxPyPolygonShapePtr):
         self.this = apply(oglshapes2c.new_wxPyPolygonShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyPolygonShape)
         self.this = apply(oglshapes2c.new_wxPyPolygonShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyPolygonShape)

+        self._setOORInfo(self)

 
 
 
 
 
 


@@ -758,6 +764,7 @@ class wxPyTextShape(wxPyTextShapePtr):
         self.this = apply(oglshapes2c.new_wxPyTextShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyTextShape)
         self.this = apply(oglshapes2c.new_wxPyTextShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyTextShape)

+        self._setOORInfo(self)