use generic timer in wxMGL and wxX11

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

diff --git a/wxPython/src/stattool.i b/wxPython/src/stattool.i
index 30ace47a474d5418868afa709be46598cf73869b..ed90127594296eb3e09dec8480c9f9cd354aea5f 100644 (file)
--- a/wxPython/src/stattool.i
+++ b/wxPython/src/stattool.i
@@ -33,17 +33,11 @@
 %pragma(python) code = "import wx"
 
 
-%{
-    static wxString wxPyEmptyStr("");
-%}
-
 //---------------------------------------------------------------------------
 
 class wxStatusBar : public wxWindow {
 public:
-    wxStatusBar(wxWindow* parent, wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
+    wxStatusBar(wxWindow* parent, wxWindowID id = -1,
                 long style = wxST_SIZEGRIP,
                 char* name = "statusBar");
     %name(wxPreStatusBar)wxStatusBar();
@@ -53,7 +47,7 @@ public:
                 char* name = "statusBar");
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
-    %pragma(python) addtomethod = "wxPreStatusBar:val._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreStatusBar:val._setOORInfo(val)"
 
     %addmethods {
         %new wxRect* GetFieldRect(long item) {
@@ -112,9 +106,9 @@ public:
     bool IsEnabled();
     bool IsToggled();
     bool CanBeToggled();
-    const wxBitmap& GetBitmap1();
-    const wxBitmap& GetBitmap2();
-    const wxBitmap& GetBitmap();
+    wxBitmap GetBitmap1();
+    wxBitmap GetBitmap2();
+    wxBitmap GetBitmap();
     wxString GetShortHelp();
     wxString GetLongHelp();
     bool Enable(bool enable);
@@ -161,8 +155,8 @@ public:
                                    const wxBitmap& pushedBitmap = wxNullBitmap,
                                    int isToggle = FALSE,
                                    PyObject *clientData = NULL,
-                                   const wxString& shortHelpString = wxPyEmptyStr,
-                                   const wxString& longHelpString = wxPyEmptyStr) {
+                                   const wxString& shortHelpString = wxEmptyString,
+                                   const wxString& longHelpString = wxEmptyString) {
             wxPyUserData* udata = NULL;
             if (clientData)
                 udata = new wxPyUserData(clientData);
@@ -173,8 +167,8 @@ public:
         // This one is easier to use...
         wxToolBarToolBase *AddSimpleTool(int id,
                                          const wxBitmap& bitmap,
-                                         const wxString& shortHelpString = wxPyEmptyStr,
-                                         const wxString& longHelpString = wxPyEmptyStr,
+                                         const wxString& shortHelpString = wxEmptyString,
+                                         const wxString& longHelpString = wxEmptyString,
                                          int isToggle = FALSE) {
             return self->AddTool(id, bitmap, wxNullBitmap, isToggle, NULL,
                                  shortHelpString, longHelpString);
@@ -188,8 +182,8 @@ public:
                                       const wxBitmap& pushedBitmap = wxNullBitmap,
                                       int isToggle = FALSE,
                                       PyObject *clientData = NULL,
-                                      const wxString& shortHelpString = wxPyEmptyStr,
-                                      const wxString& longHelpString = wxPyEmptyStr) {
+                                      const wxString& shortHelpString = wxEmptyString,
+                                      const wxString& longHelpString = wxEmptyString) {
             wxPyUserData* udata = NULL;
             if (clientData)
                 udata = new wxPyUserData(clientData);
@@ -201,8 +195,8 @@ public:
         wxToolBarToolBase *InsertSimpleTool(size_t pos,
                                             int id,
                                             const wxBitmap& bitmap,
-                                            const wxString& shortHelpString = wxPyEmptyStr,
-                                            const wxString& longHelpString = wxPyEmptyStr,
+                                            const wxString& shortHelpString = wxEmptyString,
+                                            const wxString& longHelpString = wxEmptyString,
                                             int isToggle = FALSE) {
             return self->InsertTool(pos, id, bitmap, wxNullBitmap, isToggle, NULL,
                                     shortHelpString, longHelpString);
@@ -295,7 +289,7 @@ public:
               const char* name = wxToolBarNameStr);
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
-    %pragma(python) addtomethod = "wxPreToolBar:val._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreToolBar:val._setOORInfo(val)"
 
     wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
 };
@@ -321,7 +315,7 @@ public:
                     const char* name = wxToolBarNameStr);
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
-    %pragma(python) addtomethod = "wxPreToolBarSimple:val._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreToolBarSimple:val._setOORInfo(val)"
 
     wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
 };