X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/880715c9a941c58e5f702ff340aac7138b27f6ed..6caa0f5cd18fe9fb39c207d5f31fa5633479a822:/wxPython/src/_statctrls.i?ds=sidebyside diff --git a/wxPython/src/_statctrls.i b/wxPython/src/_statctrls.i index c407a4d799..b3be54e960 100644 --- a/wxPython/src/_statctrls.i +++ b/wxPython/src/_statctrls.i @@ -19,23 +19,32 @@ MAKE_CONST_WXSTRING(StaticBitmapNameStr); MAKE_CONST_WXSTRING(StaticBoxNameStr); MAKE_CONST_WXSTRING(StaticTextNameStr); +MAKE_CONST_WXSTRING(StaticLineNameStr); //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxStaticBox); + class wxStaticBox : public wxControl { public: %pythonAppend wxStaticBox "self._setOORInfo(self)" %pythonAppend wxStaticBox() "" + %typemap(out) wxStaticBox*; // turn off this typemap - wxStaticBox(wxWindow* parent, wxWindowID id, const wxString& label, + wxStaticBox(wxWindow* parent, wxWindowID id=-1, + const wxString& label = wxPyEmptyString, const wxPoint& pos = wxDefaultPosition, 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, const wxString& label, + bool Create(wxWindow* parent, wxWindowID id=-1, + const wxString& label = wxPyEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -50,23 +59,25 @@ public: %newgroup +MustHaveApp(wxStaticLine); + class wxStaticLine : public wxControl { public: %pythonAppend wxStaticLine "self._setOORInfo(self)" %pythonAppend wxStaticLine() "" - wxStaticLine( wxWindow *parent, wxWindowID id, + wxStaticLine( wxWindow *parent, wxWindowID id=-1, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLI_HORIZONTAL, - const wxString& name = wxPyStaticTextNameStr); - %name(PreStaticLine)wxStaticLine(); + const wxString& name = wxPyStaticLineNameStr); + %RenameCtor(PreStaticLine, wxStaticLine()); - bool Create( wxWindow *parent, wxWindowID id, + bool Create( wxWindow *parent, wxWindowID id=-1, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLI_HORIZONTAL, - const wxString& name = wxPyStaticTextNameStr); + const wxString& name = wxPyStaticLineNameStr); // is the line vertical? bool IsVertical() const; @@ -82,24 +93,36 @@ public: //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxStaticText); + class wxStaticText : public wxControl { public: %pythonAppend wxStaticText "self._setOORInfo(self)" %pythonAppend wxStaticText() "" - wxStaticText(wxWindow* parent, wxWindowID id, const wxString& label, + wxStaticText(wxWindow* parent, wxWindowID id=-1, + const wxString& label = wxPyEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxPyStaticTextNameStr); - %name(PreStaticText)wxStaticText(); + %RenameCtor(PreStaticText, wxStaticText()); - bool Create(wxWindow* parent, wxWindowID id, const wxString& label, + bool Create(wxWindow* parent, wxWindowID id=-1, + const wxString& label = wxPyEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, 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); }; @@ -107,21 +130,23 @@ public: //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxStaticBitmap); + class wxStaticBitmap : public wxControl { public: %pythonAppend wxStaticBitmap "self._setOORInfo(self)" %pythonAppend wxStaticBitmap() "" - wxStaticBitmap(wxWindow* parent, wxWindowID id, - const wxBitmap& bitmap, + wxStaticBitmap(wxWindow* parent, wxWindowID id=-1, + const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxPyStaticBitmapNameStr); - %name(PreStaticBitmap)wxStaticBitmap(); + %RenameCtor(PreStaticBitmap, wxStaticBitmap()); - bool Create(wxWindow* parent, wxWindowID id, - const wxBitmap& bitmap, + bool Create(wxWindow* parent, wxWindowID id=-1, + const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,