Various updates to catch up to wxWidgets CVS

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

diff --git a/wxPython/src/_statusbar.i b/wxPython/src/_statusbar.i
index 0fc21a1f03b88855b950690f45ccacaaf8add9dc..14fa24cb934ccc0788c6cf048d1c62aae624a1b7 100644 (file)
--- a/wxPython/src/_statusbar.i
+++ b/wxPython/src/_statusbar.i
@@ -22,7 +22,15 @@
 %newgroup;
 
 
 %newgroup;
 
 

+enum {
+    wxSB_NORMAL,
+    wxSB_FLAT,
+    wxSB_RAISED
+};
+

 
 

+
+      

 // wxStatusBar: a window near the bottom of the frame used for status info
 MustHaveApp(wxStatusBar);
 class wxStatusBar : public wxWindow
 // wxStatusBar: a window near the bottom of the frame used for status info
 MustHaveApp(wxStatusBar);
 class wxStatusBar : public wxWindow


@@ -30,12 +38,16 @@ class wxStatusBar : public wxWindow
 public:
     %pythonAppend wxStatusBar         "self._setOORInfo(self)"
     %pythonAppend wxStatusBar()       ""
 public:
     %pythonAppend wxStatusBar         "self._setOORInfo(self)"
     %pythonAppend wxStatusBar()       ""

+    %typemap(out) wxStatusBar*;    // turn off this typemap

     
     wxStatusBar(wxWindow* parent, wxWindowID id = -1,
                 long style = wxDEFAULT_STATUSBAR_STYLE,
                 const wxString& name = wxPyStatusLineNameStr);
     %name(PreStatusBar)wxStatusBar();
 
     
     wxStatusBar(wxWindow* parent, wxWindowID id = -1,
                 long style = wxDEFAULT_STATUSBAR_STYLE,
                 const wxString& name = wxPyStatusLineNameStr);
     %name(PreStatusBar)wxStatusBar();
 

+    // Turn it back on again
+    %typemap(out) wxStatusBar* { $result = wxPyMake_wxObject($1, $owner); }
+

     bool Create(wxWindow* parent, wxWindowID id=-1,
                 long style = wxST_SIZEGRIP,
                 const wxString& name = wxPyStatusLineNameStr);
     bool Create(wxWindow* parent, wxWindowID id=-1,
                 long style = wxST_SIZEGRIP,
                 const wxString& name = wxPyStatusLineNameStr);


@@ -58,8 +70,16 @@ public:
     // minus the sum of fixed width fields) is divided between the fields with
     // negative width according to the abs value of the width (field with width
     // -2 grows twice as much as one with width -1 &c)
     // minus the sum of fixed width fields) is divided between the fields with
     // negative width according to the abs value of the width (field with width
     // -2 grows twice as much as one with width -1 &c)

-    virtual void SetStatusWidths(int widths, const int* widths_field); // uses typemap in _toplvl.i
+    virtual void SetStatusWidths(int widths, const int* widths_field); 

 
 

+
+    // Set the field style. Use either wxSB_NORMAL (default) for a standard 3D 
+    // border around a field, wxSB_FLAT for no border around a field, so that it 
+    // appears flat or wxSB_POPOUT to make the field appear raised.
+    // Setting field styles only works on wxMSW
+    virtual void SetStatusStyles(int styles, const int* styles_field);
+    
+    

     // Get the position and size of the field's internal bounding rectangle
     %extend {
         wxRect GetFieldRect(int i) {
     // Get the position and size of the field's internal bounding rectangle
     %extend {
         wxRect GetFieldRect(int i) {