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

[wxWidgets.git] / wxPython / src / frames.i

diff --git a/wxPython/src/frames.i b/wxPython/src/frames.i
index fc4ed7f10dd46383b6e8344fc28bc7a9e6494a6d..54f664cb17069b19aa5031887434f22038d14672 100644 (file)
--- a/wxPython/src/frames.i
+++ b/wxPython/src/frames.i
@@ -105,6 +105,8 @@ public:
     // set the frame icon
     virtual void SetIcon(const wxIcon& icon);
 
     // set the frame icon
     virtual void SetIcon(const wxIcon& icon);
 

+    // set the frame icons
+    virtual void SetIcons(const wxIconBundle& icons );

 
     // maximize the window to cover entire screen
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
 
     // maximize the window to cover entire screen
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);


@@ -258,6 +260,8 @@ public:
                          const wxSize& size = wxDefaultSize,
                          long style = wxNO_BORDER);
 
                          const wxSize& size = wxDefaultSize,
                          long style = wxNO_BORDER);
 

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+

     void SetBitmap(const wxBitmap& bitmap);
     wxBitmap& GetBitmap();
 };
     void SetBitmap(const wxBitmap& bitmap);
     wxBitmap& GetBitmap();
 };


@@ -271,6 +275,8 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxFRAME_FLOAT_ON_PARENT);
 
                    const wxSize& size = wxDefaultSize,
                    long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxFRAME_FLOAT_ON_PARENT);
 

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+

     long GetSplashStyle() const;
     wxSplashScreenWindow* GetSplashWindow() const;
     int GetTimeout() const;
     long GetSplashStyle() const;
     wxSplashScreenWindow* GetSplashWindow() const;
     int GetTimeout() const;