X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aacd7bb647b763213a96fad6a0f789fc64eaabf5..0c8392cac2d36d0d211432e71d3b24d3d93c22db:/wxPython/src/frames.i?ds=sidebyside

diff --git a/wxPython/src/frames.i b/wxPython/src/frames.i
index 54f664cb17..ea407d7766 100644
--- a/wxPython/src/frames.i
+++ b/wxPython/src/frames.i
@@ -116,6 +116,12 @@ public:
 
     virtual void SetTitle(const wxString& title);
     virtual wxString GetTitle() const;
+
+    // Set the shape of the window to the given region.
+    // Returns TRUE if the platform supports this feature (and the operation
+    // is successful.)
+    virtual bool SetShape(const wxRegion& region);
+
 };
 
 //----------------------------------------------------------------------
@@ -145,11 +151,9 @@ public:
     wxMenuBar *GetMenuBar();
 
 
-    // call this to simulate a menu command
-    bool Command(int id);
-
     // process menu command: returns TRUE if processed
     bool ProcessCommand(int id);
+    %pragma(python) addtoclass = "Command = ProcessCommand"
 
     // create the main status bar
     wxStatusBar* CreateStatusBar(int number = 1,
@@ -166,10 +170,20 @@ 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
-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL,
+    virtual wxToolBar* CreateToolBar(long style = -1, //wxNO_BORDER|wxTB_HORIZONTAL,
                                      wxWindowID id = -1,
                                      const wxString& name = wxPyToolBarNameStr);
 
@@ -177,6 +191,17 @@ public:
     virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
     virtual void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
 
+    // sends a size event to the window using its current size -- this has an
+    // effect of refreshing the window layout
+    virtual void SendSizeEvent();
+
+
+    // send wxUpdateUIEvents for all menu items in the menubar,
+    // or just for menu if non-NULL
+    void DoMenuUpdates(wxMenu* menu = NULL);
+
+    // do the UI update processing for this window
+    virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
 };
 
 //---------------------------------------------------------------------------
@@ -273,7 +298,7 @@ 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)"