X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ecc08ead918856a70559204f9b5daacc49385eaa..9337b5781906a210799a17d2a00c869c6dc2e410:/wxPython/src/frames.i

diff --git a/wxPython/src/frames.i b/wxPython/src/frames.i
index f115e7f05a..9955e0a912 100644
--- a/wxPython/src/frames.i
+++ b/wxPython/src/frames.i
@@ -16,7 +16,7 @@
 %{
 #include "helpers.h"
 #include <wx/minifram.h>
-#include <wx/tipwin.h>
+#include <wx/splash.h>
 %}
 
 //----------------------------------------------------------------------
@@ -71,6 +71,8 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const char* name = "frame");
 
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreTopLevelWindow:val._setOORInfo(val)"
 
     // maximize = TRUE => maximize, otherwise - restore
     virtual void Maximize(bool maximize = TRUE);
@@ -88,7 +90,7 @@ 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);
@@ -122,6 +124,9 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 char* name = "frame");
 
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreFrame:val._setOORInfo(val)"
+
     wxPoint GetClientAreaOrigin();
 
     void SetMenuBar(wxMenuBar *menubar);
@@ -183,6 +188,9 @@ public:
                 long style = wxDEFAULT_DIALOG_STYLE,
                 const char* name = "dialogBox");
 
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreDialog:val._setOORInfo(val)"
+
     void Centre(int direction = wxBOTH);
     void EndModal(int retCode);
     void SetModal(bool flag);
@@ -214,17 +222,48 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 char* name = "frame");
+
+    %pragma(python) addtomethod = "__init__:self._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);
+
+    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|wxFRAME_FLOAT_ON_PARENT);
+
+    long GetSplashStyle() const;
+    wxSplashScreenWindow* GetSplashWindow() const;
+    int GetTimeout() const;
 };
 
 
@@ -234,3 +273,4 @@ public:
 
 
 
+