X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0122b7e3fcfd78f879470053c91a60e3c66537a3..94bc8b14d4f74c5bb831b0eca20a45c751fbb5fe:/wxPython/src/frames.i diff --git a/wxPython/src/frames.i b/wxPython/src/frames.i index d0fd4866b1..25989c93f0 100644 --- a/wxPython/src/frames.i +++ b/wxPython/src/frames.i @@ -16,7 +16,7 @@ %{ #include "helpers.h" #include -#include +#include %} //---------------------------------------------------------------------- @@ -35,6 +35,16 @@ //---------------------------------------------------------------------- +%{ + // Put some wx default wxChar* values into wxStrings. + DECLARE_DEF_STRING(FrameNameStr); + DECLARE_DEF_STRING(DialogNameStr); + DECLARE_DEF_STRING(StatusLineNameStr); + DECLARE_DEF_STRING(ToolBarNameStr); +%} + +//---------------------------------------------------------------------- + enum { wxFULLSCREEN_NOMENUBAR, wxFULLSCREEN_NOTOOLBAR, @@ -60,7 +70,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const char* name = "frame"); + const wxString& name = wxPyFrameNameStr); %name(wxPreTopLevelWindow)wxTopLevelWindow(); bool Create(wxWindow *parent, @@ -69,10 +79,10 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const char* name = "frame"); + const wxString& name = wxPyFrameNameStr); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" - %pragma(python) addtomethod = "wxPreTopLevelWindowXXX:val._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreTopLevelWindow:val._setOORInfo(val)" // maximize = TRUE => maximize, otherwise - restore virtual void Maximize(bool maximize = TRUE); @@ -90,11 +100,13 @@ public: virtual bool IsIconized() const; // get the frame icon - const wxIcon& GetIcon() const; + wxIcon GetIcon() const; // 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); @@ -115,17 +127,17 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - char* name = "frame"); + const wxString& name = wxPyFrameNameStr); %name(wxPreFrame)wxFrame(); bool Create(wxWindow* parent, const wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - char* name = "frame"); + const wxString& name = wxPyFrameNameStr); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" - %pragma(python) addtomethod = "wxPreFrame:val._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreFrame:val._setOORInfo(val)" wxPoint GetClientAreaOrigin(); @@ -143,7 +155,7 @@ public: wxStatusBar* CreateStatusBar(int number = 1, long style = wxST_SIZEGRIP, wxWindowID id = -1, - char* name = "statusBar"); + const wxString& name = wxPyStatusLineNameStr); // get the main status bar wxStatusBar *GetStatusBar(); @@ -154,17 +166,30 @@ 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, wxWindowID id = -1, - const char* name = "toolBar"); + const wxString& name = wxPyToolBarNameStr); // get/set the main toolbar 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(); }; //--------------------------------------------------------------------------- @@ -177,7 +202,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, - const char* name = "dialogBox"); + const wxString& name = wxPyDialogNameStr); %name(wxPreDialog)wxDialog(); bool Create(wxWindow* parent, @@ -186,10 +211,10 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, - const char* name = "dialogBox"); + const wxString& name = wxPyDialogNameStr); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" - %pragma(python) addtomethod = "wxPreDialog:val._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreDialog:val._setOORInfo(val)" void Centre(int direction = wxBOTH); void EndModal(int retCode); @@ -214,30 +239,60 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - char* name = "frame"); + const wxString& name = wxPyFrameNameStr); %name(wxPreMiniFrame)wxMiniFrame(); bool Create(wxWindow* parent, const wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - char* name = "frame"); + const wxString& name = wxPyFrameNameStr); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" - %pragma(python) addtomethod = "wxPreMiniFrame:val._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreMiniFrame:val._setOORInfo(val)" }; //--------------------------------------------------------------------------- -class wxTipWindow : public wxFrame +enum { + wxSPLASH_CENTRE_ON_PARENT, + wxSPLASH_CENTRE_ON_SCREEN, + wxSPLASH_NO_CENTRE, + wxSPLASH_TIMEOUT, + wxSPLASH_NO_TIMEOUT, +}; + + +class wxSplashScreenWindow: public wxWindow { public: - wxTipWindow(wxWindow *parent, - const wxString& text, - wxCoord maxLength = 100); + wxSplashScreenWindow(const wxBitmap& bitmap, + wxWindow* parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxNO_BORDER); + + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + + void SetBitmap(const wxBitmap& bitmap); + wxBitmap& GetBitmap(); +}; + + +class wxSplashScreen : public wxFrame { +public: + wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, + wxWindow* parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + + long GetSplashStyle() const; + wxSplashScreenWindow* GetSplashWindow() const; + int GetTimeout() const; }; @@ -247,3 +302,4 @@ public: +