X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d55734102e25f5d11bcb4bbac39083320afd3699..6bda7508c6e41365b69fdf690b3070991098a7af:/wxPython/src/_cmndlgs.i?ds=sidebyside diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i index 7963a620e5..b06600a377 100644 --- a/wxPython/src/_cmndlgs.i +++ b/wxPython/src/_cmndlgs.i @@ -54,7 +54,7 @@ meaning under other platforms. The default value is true.", ""); wxColour , GetCustomColour(int i), "Gets the i'th custom colour associated with the colour dialog. i should be an integer between 0 and 15. The default custom colours are -all white.", ""); +all invalid colours.", ""); DocDeclStr( void , SetChooseFull(int flag), @@ -70,7 +70,7 @@ black.", ""); DocDeclStr( void , SetCustomColour(int i, const wxColour& colour), "Sets the i'th custom colour for the colour dialog. i should be an -integer between 0 and 15. The default custom colours are all white.", ""); +integer between 0 and 15. The default custom colours are all invalid colours.", ""); }; @@ -252,7 +252,6 @@ example:: void , SetFilterIndex(int filterIndex), "Sets the default filter index, starting from zero.", ""); - DocDeclStr( wxString , GetMessage() const, "Returns the message that will be displayed on the dialog.", ""); @@ -430,6 +429,8 @@ DocStr(wxTextEntryDialog, MustHaveApp(wxTextEntryDialog); +enum { wxTextEntryDialogStyle }; + class wxTextEntryDialog : public wxDialog { public: %pythonAppend wxTextEntryDialog "self._setOORInfo(self)" @@ -439,7 +440,7 @@ public: const wxString& message, const wxString& caption = wxPyGetTextFromUserPromptStr, const wxString& defaultValue = wxPyEmptyString, - long style = wxOK | wxCANCEL | wxCENTRE, + long style = wxTextEntryDialogStyle, const wxPoint& pos = wxDefaultPosition), "Constructor. Use ShowModal method to show the dialog.", ""); @@ -455,6 +456,21 @@ or the original value if the user has pressed Cancel.", ""); //--------------------------------------------------------------------------- +MAKE_CONST_WXSTRING(GetPasswordFromUserPromptStr); + +class wxPasswordEntryDialog : public wxTextEntryDialog +{ +public: + wxPasswordEntryDialog(wxWindow *parent, + const wxString& message, + const wxString& caption = wxPyGetPasswordFromUserPromptStr, + const wxString& value = wxPyEmptyString, + long style = wxTextEntryDialogStyle, + const wxPoint& pos = wxDefaultPosition); +}; + +//--------------------------------------------------------------------------- + DocStr(wxFontData, "This class holds a variety of information related to font dialogs and @@ -660,8 +676,10 @@ parent window only.", ""); DocDeclStr( virtual bool , Update(int value, const wxString& newmsg = wxPyEmptyString), "Updates the dialog, setting the progress bar to the new value and, if -given changes the message above it. Returns true unless the Cancel -button has been pressed. +given changes the message above it. The value given should be less +than or equal to the maximum value given to the constructor and the +dialog is closed if it is equal to the maximum. Returns true unless +the Cancel button has been pressed. If false is returned, the application can either immediately destroy the dialog or ask the user for the confirmation and if the abort is