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 7a82522e7536cadd0c688a428a596838a72dbade..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 *
@@ -15,59 +17,96 @@ from controls import *
 
 from events import *
 import wx
-class wxFramePtr(wxWindowPtr):
+class wxTopLevelWindowPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def Centre(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_Centre,(self,) + _args, _kwargs)
+    def Create(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_Create,(self,) + _args, _kwargs)
         return val
-    def CreateStatusBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_CreateStatusBar,(self,) + _args, _kwargs)
+    def Maximize(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_Maximize,(self,) + _args, _kwargs)
         return val
-    def CreateToolBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_CreateToolBar,(self,) + _args, _kwargs)
+    def Restore(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_Restore,(self,) + _args, _kwargs)
         return val
-    def GetIcon(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_GetIcon,(self,) + _args, _kwargs)
-        if val: val = wxIconPtr(val) 
+    def Iconize(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_Iconize,(self,) + _args, _kwargs)
         return val
-    def GetMenuBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_GetMenuBar,(self,) + _args, _kwargs)
+    def IsMaximized(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_IsMaximized,(self,) + _args, _kwargs)
         return val
-    def GetStatusBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_GetStatusBar,(self,) + _args, _kwargs)
+    def IsIconized(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_IsIconized,(self,) + _args, _kwargs)
         return val
-    def GetTitle(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_GetTitle,(self,) + _args, _kwargs)
+    def GetIcon(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_GetIcon,(self,) + _args, _kwargs)
+        if val: val = wxIconPtr(val) ; val.thisown = 1
         return val
-    def GetToolBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_GetToolBar,(self,) + _args, _kwargs)
+    def SetIcon(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_SetIcon,(self,) + _args, _kwargs)
         return val
-    def Iconize(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_Iconize,(self,) + _args, _kwargs)
+    def SetIcons(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_SetIcons,(self,) + _args, _kwargs)
         return val
-    def IsIconized(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_IsIconized,(self,) + _args, _kwargs)
+    def ShowFullScreen(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_ShowFullScreen,(self,) + _args, _kwargs)
         return val
-    def Maximize(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_Maximize,(self,) + _args, _kwargs)
+    def IsFullScreen(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_IsFullScreen,(self,) + _args, _kwargs)
         return val
-    def IsMaximized(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_IsMaximized,(self,) + _args, _kwargs)
+    def SetTitle(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_SetTitle,(self,) + _args, _kwargs)
         return val
-    def Restore(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_Restore,(self,) + _args, _kwargs)
+    def GetTitle(self, *_args, **_kwargs):
+        val = apply(framesc.wxTopLevelWindow_GetTitle,(self,) + _args, _kwargs)
         return val
-    def SetAcceleratorTable(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_SetAcceleratorTable,(self,) + _args, _kwargs)
+    def __repr__(self):
+        return "<C wxTopLevelWindow instance at %s>" % (self.this,)
+class wxTopLevelWindow(wxTopLevelWindowPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(framesc.new_wxTopLevelWindow,_args,_kwargs)
+        self.thisown = 1
+        self._setOORInfo(self)
+
+
+
+def wxPreTopLevelWindow(*_args,**_kwargs):
+    val = wxTopLevelWindowPtr(apply(framesc.new_wxPreTopLevelWindow,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+
+
+class wxFramePtr(wxTopLevelWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_Create,(self,) + _args, _kwargs)
         return val
-    def SetIcon(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_SetIcon,(self,) + _args, _kwargs)
+    def GetClientAreaOrigin(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_GetClientAreaOrigin,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def SetMenuBar(self, *_args, **_kwargs):
         val = apply(framesc.wxFrame_SetMenuBar,(self,) + _args, _kwargs)
         return val
+    def GetMenuBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_GetMenuBar,(self,) + _args, _kwargs)
+        return val
+    def Command(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_Command,(self,) + _args, _kwargs)
+        return val
+    def ProcessCommand(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_ProcessCommand,(self,) + _args, _kwargs)
+        return val
+    def CreateStatusBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_CreateStatusBar,(self,) + _args, _kwargs)
+        return val
+    def GetStatusBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_GetStatusBar,(self,) + _args, _kwargs)
+        return val
     def SetStatusBar(self, *_args, **_kwargs):
         val = apply(framesc.wxFrame_SetStatusBar,(self,) + _args, _kwargs)
         return val
@@ -77,67 +116,150 @@ class wxFramePtr(wxWindowPtr):
     def SetStatusWidths(self, *_args, **_kwargs):
         val = apply(framesc.wxFrame_SetStatusWidths,(self,) + _args, _kwargs)
         return val
-    def SetTitle(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_SetTitle,(self,) + _args, _kwargs)
+    def CreateToolBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_CreateToolBar,(self,) + _args, _kwargs)
+        return val
+    def GetToolBar(self, *_args, **_kwargs):
+        val = apply(framesc.wxFrame_GetToolBar,(self,) + _args, _kwargs)
         return val
     def SetToolBar(self, *_args, **_kwargs):
         val = apply(framesc.wxFrame_SetToolBar,(self,) + _args, _kwargs)
         return val
-    def MakeModal(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_MakeModal,(self,) + _args, _kwargs)
+    def __repr__(self):
+        return "<C wxFrame instance at %s>" % (self.this,)
+class wxFrame(wxFramePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(framesc.new_wxFrame,_args,_kwargs)
+        self.thisown = 1
+        self._setOORInfo(self)
+
+
+
+def wxPreFrame(*_args,**_kwargs):
+    val = wxFramePtr(apply(framesc.new_wxPreFrame,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+
+
+class wxDialogPtr(wxTopLevelWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(framesc.wxDialog_Create,(self,) + _args, _kwargs)
         return val
-    def GetClientAreaOrigin(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_GetClientAreaOrigin,(self,) + _args, _kwargs)
-        if val: val = wxPointPtr(val) ; val.thisown = 1
+    def Centre(self, *_args, **_kwargs):
+        val = apply(framesc.wxDialog_Centre,(self,) + _args, _kwargs)
         return val
-    def Command(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_Command,(self,) + _args, _kwargs)
+    def EndModal(self, *_args, **_kwargs):
+        val = apply(framesc.wxDialog_EndModal,(self,) + _args, _kwargs)
         return val
-    def ProcessCommand(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_ProcessCommand,(self,) + _args, _kwargs)
+    def SetModal(self, *_args, **_kwargs):
+        val = apply(framesc.wxDialog_SetModal,(self,) + _args, _kwargs)
         return val
-    def ShowFullScreen(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_ShowFullScreen,(self,) + _args, _kwargs)
+    def IsModal(self, *_args, **_kwargs):
+        val = apply(framesc.wxDialog_IsModal,(self,) + _args, _kwargs)
         return val
-    def IsFullScreen(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_IsFullScreen,(self,) + _args, _kwargs)
+    def ShowModal(self, *_args, **_kwargs):
+        val = apply(framesc.wxDialog_ShowModal,(self,) + _args, _kwargs)
+        return val
+    def GetReturnCode(self, *_args, **_kwargs):
+        val = apply(framesc.wxDialog_GetReturnCode,(self,) + _args, _kwargs)
+        return val
+    def SetReturnCode(self, *_args, **_kwargs):
+        val = apply(framesc.wxDialog_SetReturnCode,(self,) + _args, _kwargs)
+        return val
+    def CreateTextSizer(self, *_args, **_kwargs):
+        val = apply(framesc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs)
+        return val
+    def CreateButtonSizer(self, *_args, **_kwargs):
+        val = apply(framesc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxFrame instance at %s>" % (self.this,)
-class wxFrame(wxFramePtr):
+        return "<C wxDialog instance at %s>" % (self.this,)
+class wxDialog(wxDialogPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(framesc.new_wxFrame,_args,_kwargs)
+        self.this = apply(framesc.new_wxDialog,_args,_kwargs)
         self.thisown = 1
-        #wx._StdFrameCallbacks(self)
+        self._setOORInfo(self)
+
 
 
+def wxPreDialog(*_args,**_kwargs):
+    val = wxDialogPtr(apply(framesc.new_wxPreDialog,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
 
 
 class wxMiniFramePtr(wxFramePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(framesc.wxMiniFrame_Create,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxMiniFrame instance at %s>" % (self.this,)
 class wxMiniFrame(wxMiniFramePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(framesc.new_wxMiniFrame,_args,_kwargs)
         self.thisown = 1
-        #wx._StdFrameCallbacks(self)
+        self._setOORInfo(self)
+
+
+
+def wxPreMiniFrame(*_args,**_kwargs):
+    val = wxMiniFramePtr(apply(framesc.new_wxPreMiniFrame,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    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 wxTipWindowPtr(wxFramePtr):
+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 wxTipWindow instance at %s>" % (self.this,)
-class wxTipWindow(wxTipWindowPtr):
+        return "<C wxSplashScreen instance at %s>" % (self.this,)
+class wxSplashScreen(wxSplashScreenPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(framesc.new_wxTipWindow,_args,_kwargs)
+        self.this = apply(framesc.new_wxSplashScreen,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -156,3 +278,9 @@ wxFULLSCREEN_NOSTATUSBAR = framesc.wxFULLSCREEN_NOSTATUSBAR
 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