bitwise vs. logical operator

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

diff --git a/wxPython/src/_statctrls.i b/wxPython/src/_statctrls.i
index 3c15670aaf0a69274a839657d3b10ec08a0ba42b..240cc738778cc35c0aa8dc5e44ebfcf5454c867b 100644 (file)
--- a/wxPython/src/_statctrls.i
+++ b/wxPython/src/_statctrls.i
@@ -29,6 +29,7 @@ class wxStaticBox : public wxControl {
 public:
     %pythonAppend wxStaticBox         "self._setOORInfo(self)"
     %pythonAppend wxStaticBox()       ""
 public:
     %pythonAppend wxStaticBox         "self._setOORInfo(self)"
     %pythonAppend wxStaticBox()       ""

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

 
     wxStaticBox(wxWindow* parent, wxWindowID id=-1,
                 const wxString& label = wxPyEmptyString,
 
     wxStaticBox(wxWindow* parent, wxWindowID id=-1,
                 const wxString& label = wxPyEmptyString,


@@ -36,7 +37,10 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxPyStaticBoxNameStr);
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxPyStaticBoxNameStr);

-    %name(PreStaticBox)wxStaticBox();
+    %RenameCtor(PreStaticBox, wxStaticBox());
+
+    // Turn it back on again
+    %typemap(out) wxStaticBox* { $result = wxPyMake_wxObject($1, $owner); }

 
     bool Create(wxWindow* parent, wxWindowID id=-1,
                 const wxString& label = wxPyEmptyString,
 
     bool Create(wxWindow* parent, wxWindowID id=-1,
                 const wxString& label = wxPyEmptyString,


@@ -66,7 +70,7 @@ public:
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
                   const wxString& name = wxPyStaticTextNameStr);
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
                   const wxString& name = wxPyStaticTextNameStr);

-    %name(PreStaticLine)wxStaticLine();
+    %RenameCtor(PreStaticLine, wxStaticLine());

 
     bool Create( wxWindow *parent, wxWindowID id=-1,
                   const wxPoint &pos = wxDefaultPosition,
 
     bool Create( wxWindow *parent, wxWindowID id=-1,
                   const wxPoint &pos = wxDefaultPosition,


@@ -101,7 +105,7 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxString& name = wxPyStaticTextNameStr);
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxString& name = wxPyStaticTextNameStr);

-    %name(PreStaticText)wxStaticText();
+    %RenameCtor(PreStaticText, wxStaticText());

 
     bool Create(wxWindow* parent, wxWindowID id=-1,
                 const wxString& label = wxPyEmptyString,
 
     bool Create(wxWindow* parent, wxWindowID id=-1,
                 const wxString& label = wxPyEmptyString,


@@ -110,6 +114,14 @@ public:
                  long style = 0,
                  const wxString& name = wxPyStaticTextNameStr);
 
                  long style = 0,
                  const wxString& name = wxPyStaticTextNameStr);
 

+    DocDeclStr(
+        void , Wrap(int width),
+        "This functions wraps the control's label so that each of its lines
+becomes at most ``width`` pixels wide if possible (the lines are
+broken at words boundaries so it might not be the case if words are
+too long). If ``width`` is negative, no wrapping is done.", "");
+    
+    

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


@@ -130,7 +142,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxString& name = wxPyStaticBitmapNameStr);
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxString& name = wxPyStaticBitmapNameStr);

-    %name(PreStaticBitmap)wxStaticBitmap();
+    %RenameCtor(PreStaticBitmap, wxStaticBitmap());

 
     bool Create(wxWindow* parent, wxWindowID id=-1,
                    const wxBitmap& bitmap = wxNullBitmap,
 
     bool Create(wxWindow* parent, wxWindowID id=-1,
                    const wxBitmap& bitmap = wxNullBitmap,