X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2dc104421c340091342156d6b01f61f1ccff438..962162620ff8b78f4d25c7f4ccec88ce071dfb2b:/wxPython/src/_toplvl.i diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i index 5f782c7a0f..1d2ffdd75a 100644 --- a/wxPython/src/_toplvl.i +++ b/wxPython/src/_toplvl.i @@ -109,8 +109,8 @@ public: class wxFrame : public wxTopLevelWindow { public: - %addtofunc wxFrame "self._setOORInfo(self)" - %addtofunc wxFrame() "" + %pythonAppend wxFrame "self._setOORInfo(self)" + %pythonAppend wxFrame() "" wxFrame(wxWindow* parent, const wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -156,7 +156,7 @@ public: // create the main status bar by calling OnCreateStatusBar() virtual wxStatusBar* CreateStatusBar(int number = 1, - long style = wxST_SIZEGRIP, + long style = wxDEFAULT_STATUSBAR_STYLE, wxWindowID winid = 0, const wxString& name = wxPyStatusLineNameStr); // TODO: with directors? @@ -216,8 +216,8 @@ public: class wxDialog : public wxTopLevelWindow { public: - %addtofunc wxDialog "self._setOORInfo(self)" - %addtofunc wxDialog() "" + %pythonAppend wxDialog "self._setOORInfo(self)" + %pythonAppend wxDialog() "" wxDialog(wxWindow* parent, const wxWindowID id, @@ -250,7 +250,9 @@ public: wxSizer *CreateButtonSizer( long flags ); - void SetModal(bool flag); + //void SetModal(bool flag); + + // is the dialog in modal state right now? virtual bool IsModal() const; // Shows the dialog and starts a nested event loop that returns when @@ -278,8 +280,8 @@ public: class wxMiniFrame : public wxFrame { public: - %addtofunc wxMiniFrame "self._setOORInfo(self)" - %addtofunc wxMiniFrame() "" + %pythonAppend wxMiniFrame "self._setOORInfo(self)" + %pythonAppend wxMiniFrame() "" wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -313,7 +315,7 @@ enum { class wxSplashScreenWindow: public wxWindow { public: - %addtofunc wxSplashScreenWindow "self._setOORInfo(self)" + %pythonAppend wxSplashScreenWindow "self._setOORInfo(self)" wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent, wxWindowID id, @@ -328,7 +330,7 @@ public: class wxSplashScreen : public wxFrame { public: - %addtofunc wxSplashScreen "self._setOORInfo(self)" + %pythonAppend wxSplashScreen "self._setOORInfo(self)" wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id,