X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/422d0ff0bec79832494fe4605ffdcf8e87ba6c03..68a9527d5185cdd9d3fef3d9421415c50de8794d:/include/wx/generic/textdlgg.h?ds=sidebyside diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h index b255dd89a4..88a65fbd9b 100644 --- a/include/wx/generic/textdlgg.h +++ b/include/wx/generic/textdlgg.h @@ -12,12 +12,9 @@ #ifndef __TEXTDLGH_G__ #define __TEXTDLGH_G__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "textdlgg.h" -#endif +#include "wx/defs.h" #if wxUSE_TEXTDLG -#include "wx/defs.h" #include "wx/dialog.h" @@ -27,7 +24,8 @@ class WXDLLEXPORT wxTextCtrl; -WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr; +extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[]; +extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[]; #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY) @@ -49,7 +47,7 @@ public: wxString GetValue() const { return m_value; } #if wxUSE_VALIDATORS - void SetTextValidator( wxTextValidator& validator ); + void SetTextValidator( const wxTextValidator& validator ); void SetTextValidator( long style = wxFILTER_NONE ); wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); } #endif @@ -69,6 +67,24 @@ private: DECLARE_NO_COPY_CLASS(wxTextEntryDialog) }; +// ---------------------------------------------------------------------------- +// wxPasswordEntryDialog: dialog with password control, [ok] and [cancel] +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxPasswordEntryDialog : public wxTextEntryDialog +{ +public: + wxPasswordEntryDialog(wxWindow *parent, + const wxString& message, + const wxString& caption = wxGetPasswordFromUserPromptStr, + const wxString& value = wxEmptyString, + long style = wxTextEntryDialogStyle, + const wxPoint& pos = wxDefaultPosition); +private: + DECLARE_DYNAMIC_CLASS(wxPasswordEntryDialog) + DECLARE_NO_COPY_CLASS(wxPasswordEntryDialog) +}; + // ---------------------------------------------------------------------------- // function to get a string from user // ---------------------------------------------------------------------------- @@ -78,15 +94,18 @@ wxGetTextFromUser(const wxString& message, const wxString& caption = wxGetTextFromUserPromptStr, const wxString& default_value = wxEmptyString, wxWindow *parent = (wxWindow *) NULL, - int x = wxDefaultCoord, - int y = wxDefaultCoord, + wxCoord x = wxDefaultCoord, + wxCoord y = wxDefaultCoord, bool centre = true); wxString WXDLLEXPORT wxGetPasswordFromUser(const wxString& message, - const wxString& caption = wxGetTextFromUserPromptStr, + const wxString& caption = wxGetPasswordFromUserPromptStr, const wxString& default_value = wxEmptyString, - wxWindow *parent = (wxWindow *) NULL); + wxWindow *parent = (wxWindow *) NULL, + wxCoord x = wxDefaultCoord, + wxCoord y = wxDefaultCoord, + bool centre = true); #endif // wxUSE_TEXTDLG