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

[wxWidgets.git] / wxPython / src / msw / frames.py

diff --git a/wxPython/src/msw/frames.py b/wxPython/src/msw/frames.py
index 8a267e59ef5cf3faa6ce70cf869cdb7df8f1f41d..d2ac054f6ae78074ff225ba4b09fe893529cff45 100644 (file)
--- a/wxPython/src/msw/frames.py
+++ b/wxPython/src/msw/frames.py
@@ -5,6 +5,8 @@ from misc import *
 
 from gdi import *
 
+from fonts import *
+
 from windows import *
 
 from clip_dnd import *
@@ -44,6 +46,9 @@ class wxTopLevelWindowPtr(wxWindowPtr):
     def SetIcon(self, *_args, **_kwargs):
         val = apply(framesc.wxTopLevelWindow_SetIcon,(self,) + _args, _kwargs)
         return val
+    def SetIcons(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_SetIcons,(self,) + _args, _kwargs)
+        return val
     def ShowFullScreen(self, *_args, **_kwargs):
         val = apply(framesc.wxTopLevelWindow_ShowFullScreen,(self,) + _args, _kwargs)
         return val
@@ -212,6 +217,53 @@ def wxPreMiniFrame(*_args,**_kwargs):
     return val
 
 
+class wxSplashScreenWindowPtr(wxWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetBitmap(self, *_args, **_kwargs):
+        val = apply(framesc.wxSplashScreenWindow_SetBitmap,(self,) + _args, _kwargs)
+        return val
+    def GetBitmap(self, *_args, **_kwargs):
+        val = apply(framesc.wxSplashScreenWindow_GetBitmap,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxSplashScreenWindow instance at %s>" % (self.this,)
+class wxSplashScreenWindow(wxSplashScreenWindowPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(framesc.new_wxSplashScreenWindow,_args,_kwargs)
+        self.thisown = 1
+        self._setOORInfo(self)
+
+
+
+
+class wxSplashScreenPtr(wxFramePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetSplashStyle(self, *_args, **_kwargs):
+        val = apply(framesc.wxSplashScreen_GetSplashStyle,(self,) + _args, _kwargs)
+        return val
+    def GetSplashWindow(self, *_args, **_kwargs):
+        val = apply(framesc.wxSplashScreen_GetSplashWindow,(self,) + _args, _kwargs)
+        if val: val = wxSplashScreenWindowPtr(val) 
+        return val
+    def GetTimeout(self, *_args, **_kwargs):
+        val = apply(framesc.wxSplashScreen_GetTimeout,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxSplashScreen instance at %s>" % (self.this,)
+class wxSplashScreen(wxSplashScreenPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(framesc.new_wxSplashScreen,_args,_kwargs)
+        self.thisown = 1
+        self._setOORInfo(self)
+
+
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------
@@ -227,3 +279,8 @@ wxFULLSCREEN_NOBORDER = framesc.wxFULLSCREEN_NOBORDER
 wxFULLSCREEN_NOCAPTION = framesc.wxFULLSCREEN_NOCAPTION
 wxFULLSCREEN_ALL = framesc.wxFULLSCREEN_ALL
 wxTOPLEVEL_EX_DIALOG = framesc.wxTOPLEVEL_EX_DIALOG
+wxSPLASH_CENTRE_ON_PARENT = framesc.wxSPLASH_CENTRE_ON_PARENT
+wxSPLASH_CENTRE_ON_SCREEN = framesc.wxSPLASH_CENTRE_ON_SCREEN
+wxSPLASH_NO_CENTRE = framesc.wxSPLASH_NO_CENTRE
+wxSPLASH_TIMEOUT = framesc.wxSPLASH_TIMEOUT
+wxSPLASH_NO_TIMEOUT = framesc.wxSPLASH_NO_TIMEOUT