Changed the default style flags on wxSplashScreen

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

diff --git a/wxPython/src/frames.i b/wxPython/src/frames.i
index 9955e0a912223bb356cce7dcc9b9d04817084743..03cc0edfa27248fd193cc624d27e038a8595c87a 100644 (file)
--- a/wxPython/src/frames.i
+++ b/wxPython/src/frames.i
@@ -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,
 enum {
     wxFULLSCREEN_NOMENUBAR,
     wxFULLSCREEN_NOTOOLBAR,


@@ -60,7 +70,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE,
                      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,
     %name(wxPreTopLevelWindow)wxTopLevelWindow();
 
     bool Create(wxWindow *parent,


@@ -69,7 +79,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 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 = "wxPreTopLevelWindow:val._setOORInfo(val)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreTopLevelWindow:val._setOORInfo(val)"


@@ -95,6 +105,8 @@ public:
     // set the frame icon
     virtual void SetIcon(const wxIcon& icon);
 
     // 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);
 
     // maximize the window to cover entire screen
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);


@@ -115,14 +127,14 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,
             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,
     %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(val)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreFrame:val._setOORInfo(val)"


@@ -143,7 +155,7 @@ public:
     wxStatusBar* CreateStatusBar(int number = 1,
                                  long style = wxST_SIZEGRIP,
                                  wxWindowID id = -1,
     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();
 
     // get the main status bar
     wxStatusBar *GetStatusBar();


@@ -154,12 +166,22 @@ public:
     // forward these to status bar
     virtual void SetStatusText(const wxString &text, int number = 0);
     virtual void SetStatusWidths(int LCOUNT, int* choices); // uses typemap
     // 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,
 
 
     // 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; }
 
     // get/set the main toolbar
     virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }


@@ -177,7 +199,7 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,
              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,
     %name(wxPreDialog)wxDialog();
 
     bool Create(wxWindow* parent,


@@ -186,7 +208,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_DIALOG_STYLE,
                 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(val)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreDialog:val._setOORInfo(val)"


@@ -214,14 +236,14 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 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,
     %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(val)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreMiniFrame:val._setOORInfo(val)"


@@ -248,6 +270,8 @@ public:
                          const wxSize& size = wxDefaultSize,
                          long style = wxNO_BORDER);
 
                          const wxSize& size = wxDefaultSize,
                          long style = wxNO_BORDER);
 

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+

     void SetBitmap(const wxBitmap& bitmap);
     wxBitmap& GetBitmap();
 };
     void SetBitmap(const wxBitmap& bitmap);
     wxBitmap& GetBitmap();
 };


@@ -259,7 +283,9 @@ public:
                    wxWindow* parent, wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    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;
 
     long GetSplashStyle() const;
     wxSplashScreenWindow* GetSplashWindow() const;