-1->wxID_ANY, TRUE->true, FALSE->false and tabs replacements.

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

diff --git a/wxPython/src/_statusbar.i b/wxPython/src/_statusbar.i
index 360970e3fafb221d69b1d33c9aeec0db461fcfca..0fc21a1f03b88855b950690f45ccacaaf8add9dc 100644 (file)
--- a/wxPython/src/_statusbar.i
+++ b/wxPython/src/_statusbar.i
@@ -22,19 +22,21 @@
 %newgroup;
 
 
 %newgroup;
 
 

+

 // wxStatusBar: a window near the bottom of the frame used for status info
 // wxStatusBar: a window near the bottom of the frame used for status info

+MustHaveApp(wxStatusBar);

 class wxStatusBar : public wxWindow
 {
 public:
 class wxStatusBar : public wxWindow
 {
 public:

-    %addtofunc wxStatusBar         "self._setOORInfo(self)"
-    %addtofunc wxStatusBar()       ""
+    %pythonAppend wxStatusBar         "self._setOORInfo(self)"
+    %pythonAppend wxStatusBar()       ""

     
     wxStatusBar(wxWindow* parent, wxWindowID id = -1,
     
     wxStatusBar(wxWindow* parent, wxWindowID id = -1,

-                long style = wxST_SIZEGRIP,
+                long style = wxDEFAULT_STATUSBAR_STYLE,

                 const wxString& name = wxPyStatusLineNameStr);
     %name(PreStatusBar)wxStatusBar();
 
                 const wxString& name = wxPyStatusLineNameStr);
     %name(PreStatusBar)wxStatusBar();
 

-    bool Create(wxWindow* parent, wxWindowID id,
+    bool Create(wxWindow* parent, wxWindowID id=-1,

                 long style = wxST_SIZEGRIP,
                 const wxString& name = wxPyStatusLineNameStr);
 
                 long style = wxST_SIZEGRIP,
                 const wxString& name = wxPyStatusLineNameStr);
 


@@ -59,14 +61,23 @@ public:
     virtual void SetStatusWidths(int widths, const int* widths_field); // uses typemap in _toplvl.i
 
     // Get the position and size of the field's internal bounding rectangle
     virtual void SetStatusWidths(int widths, const int* widths_field); // uses typemap in _toplvl.i
 
     // Get the position and size of the field's internal bounding rectangle

-    virtual bool GetFieldRect(int i, wxRect& rect) const;
-
+    %extend {
+        wxRect GetFieldRect(int i) {
+            wxRect r;
+            self->GetFieldRect(i, r);
+            return r;
+        }
+    }
+    

     // sets the minimal vertical size of the status bar
     virtual void SetMinHeight(int height);
 
     // get the dimensions of the horizontal and vertical borders
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
     // sets the minimal vertical size of the status bar
     virtual void SetMinHeight(int height);
 
     // get the dimensions of the horizontal and vertical borders
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;

+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 };
 
 
 };