X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2dc104421c340091342156d6b01f61f1ccff438..c655dbdd8987b4d64b453bbbd8938d813387dd93:/wxPython/src/_statctrls.i diff --git a/wxPython/src/_statctrls.i b/wxPython/src/_statctrls.i index 097e0f314d..904bcbd2b2 100644 --- a/wxPython/src/_statctrls.i +++ b/wxPython/src/_statctrls.i @@ -19,27 +19,39 @@ MAKE_CONST_WXSTRING(StaticBitmapNameStr); MAKE_CONST_WXSTRING(StaticBoxNameStr); MAKE_CONST_WXSTRING(StaticTextNameStr); +MAKE_CONST_WXSTRING(StaticLineNameStr); //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxStaticBox); + class wxStaticBox : public wxControl { public: - %addtofunc wxStaticBox "self._setOORInfo(self)" - %addtofunc wxStaticBox() "" + %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, const wxString& name = wxPyStaticBoxNameStr); + + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); }; @@ -47,73 +59,119 @@ public: %newgroup +MustHaveApp(wxStaticLine); + class wxStaticLine : public wxControl { public: - %addtofunc wxStaticLine "self._setOORInfo(self)" - %addtofunc wxStaticLine() "" + %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; // get the default size for the "lesser" dimension of the static line - static int GetDefaultSize() { return 2; } + static int GetDefaultSize(); + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); }; //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxStaticText); + +enum { + wxST_NO_AUTORESIZE, + wxST_MARKUP, + + wxST_ELLIPSIZE_START, + wxST_ELLIPSIZE_MIDDLE, + wxST_ELLIPSIZE_END +}; + + class wxStaticText : public wxControl { public: - %addtofunc wxStaticText "self._setOORInfo(self)" - %addtofunc wxStaticText() "" + %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.", ""); + + bool IsEllipsized() const; + + DocDeclStr( + static wxString , RemoveMarkup(const wxString& str), + "Removes the markup accepted by wx.StaticText when wx.ST_MARKUP is +used, and then returns the cleaned string. + ", ""); + + + DocDeclStr( + static wxString , EscapeMarkup(const wxString& str), + "Escapes the alls special symbols (<>\"\'&) present inside the given +string using the corresponding entities (< > " ' +&)", ""); + + + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); }; //--------------------------------------------------------------------------- %newgroup +MustHaveApp(wxStaticBitmap); + class wxStaticBitmap : public wxControl { public: - %addtofunc wxStaticText "self._setOORInfo(self)" - %addtofunc wxStaticText() "" + %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, @@ -122,6 +180,9 @@ public: wxBitmap GetBitmap(); void SetBitmap(const wxBitmap& bitmap); void SetIcon(const wxIcon& icon); + + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); }; //---------------------------------------------------------------------------