X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5a5d6473c0f5339854a4105a57c6a733632f073..9fd9e47a93dfcdd99c2722e288a0f28a51ce6f5f:/wxPython/src/frames.i

diff --git a/wxPython/src/frames.i b/wxPython/src/frames.i
index 9955e0a912..54f664cb17 100644
--- 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,
@@ -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,7 +79,7 @@ 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 = "wxPreTopLevelWindow:val._setOORInfo(val)"
@@ -95,6 +105,8 @@ public:
     // 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,14 +127,14 @@ 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(val)"
@@ -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();
@@ -159,7 +171,7 @@ public:
     // 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; }
@@ -177,7 +189,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,7 +198,7 @@ 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(val)"
@@ -214,14 +226,14 @@ 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(val)"
@@ -248,6 +260,8 @@ public:
                          const wxSize& size = wxDefaultSize,
                          long style = wxNO_BORDER);
 
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+
     void SetBitmap(const wxBitmap& bitmap);
     wxBitmap& GetBitmap();
 };
@@ -261,6 +275,8 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxFRAME_FLOAT_ON_PARENT);
 
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+
     long GetSplashStyle() const;
     wxSplashScreenWindow* GetSplashWindow() const;
     int GetTimeout() const;