compilation error fix (trailing comma in an enum)

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

diff --git a/wxPython/src/frames.i b/wxPython/src/frames.i
index fc4ed7f10dd46383b6e8344fc28bc7a9e6494a6d..03cc0edfa27248fd193cc624d27e038a8595c87a 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 icons
+    virtual void SetIcons(const wxIconBundle& icons );
 
     // maximize the window to cover entire screen
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
@@ -164,6 +166,16 @@ public:
     // forward these to status bar
     virtual void SetStatusText(const wxString &text, int number = 0);
     virtual void SetStatusWidths(int LCOUNT, int* choices); // uses typemap
+    void PushStatusText(const wxString &text, int number = 0);
+    void PopStatusText(int number = 0);
+
+    // show help text (typically in the statusbar); show is FALSE
+    // if you are hiding the help, TRUE otherwise
+    virtual void DoGiveHelp(const wxString& text, bool show);
+
+    // set the status bar pane the help will be shown in
+    void SetStatusBarPane(int n);
+    int GetStatusBarPane() const;
 
 
     // create main toolbar
@@ -258,6 +270,8 @@ public:
                          const wxSize& size = wxDefaultSize,
                          long style = wxNO_BORDER);
 
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+
     void SetBitmap(const wxBitmap& bitmap);
     wxBitmap& GetBitmap();
 };
@@ -269,7 +283,9 @@ public:
                    wxWindow* parent, wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
-                   long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxFRAME_FLOAT_ON_PARENT);
+                   long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP);
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 
     long GetSplashStyle() const;
     wxSplashScreenWindow* GetSplashWindow() const;