X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca65c0440a7163e4e37e48b1c4329709d722db47..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/textdlgg.h diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h index 8f8bc0e481..a0f8fbcf3b 100644 --- a/include/wx/generic/textdlgg.h +++ b/include/wx/generic/textdlgg.h @@ -9,25 +9,24 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __TEXTDLGH_G__ -#define __TEXTDLGH_G__ +#ifndef _WX_TEXTDLGG_H_ +#define _WX_TEXTDLGG_H_ -#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" #if wxUSE_VALIDATORS #include "wx/valtext.h" +#include "wx/textctrl.h" #endif -class WXDLLEXPORT wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE 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 +48,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 +68,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,17 +95,19 @@ wxGetTextFromUser(const wxString& message, const wxString& caption = wxGetTextFromUserPromptStr, const wxString& default_value = wxEmptyString, wxWindow *parent = (wxWindow *) NULL, - int x = wxDefaultPosition.x, - int y = wxDefaultPosition.y, + 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 -#endif - // __TEXTDLGH_G__ +#endif // _WX_TEXTDLGG_H_