X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7260478196b59ffd83c3328f710ba6f45860428..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/generic/textdlgg.h?ds=sidebyside diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h index a5d0000d47..fab6bfeaf4 100644 --- a/include/wx/generic/textdlgg.h +++ b/include/wx/generic/textdlgg.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: textdlgg.h -// Purpose: wxStatusBar class +// Purpose: wxTextEntryDialog class // Author: Julian Smart // Modified by: // Created: 01/02/97 @@ -9,26 +9,24 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __TEXTDLGH_G__ -#define __TEXTDLGH_G__ +#ifndef _WX_TEXTDLGG_H_ +#define _WX_TEXTDLGG_H_ -#if defined(__GNUG__) && !defined(__APPLE__) - #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; -WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; +extern WXDLLIMPEXP_DATA_CORE(const char) wxGetTextFromUserPromptStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxGetPasswordFromUserPromptStr[]; #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY) @@ -36,7 +34,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; // wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTextEntryDialog : public wxDialog +class WXDLLIMPEXP_CORE wxTextEntryDialog : public wxDialog { public: wxTextEntryDialog(wxWindow *parent, @@ -50,8 +48,11 @@ public: wxString GetValue() const { return m_value; } #if wxUSE_VALIDATORS - void SetTextValidator( wxTextValidator& validator ); - void SetTextValidator( long style = wxFILTER_NONE ); + void SetTextValidator( const wxTextValidator& validator ); +#if WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED( void SetTextValidator( long style ) ); +#endif + void SetTextValidator( wxTextValidatorStyle style = wxFILTER_NONE ); wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); } #endif // wxUSE_VALIDATORS @@ -67,29 +68,49 @@ protected: private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxTextEntryDialog) - DECLARE_NO_COPY_CLASS(wxTextEntryDialog) + wxDECLARE_NO_COPY_CLASS(wxTextEntryDialog); +}; + +// ---------------------------------------------------------------------------- +// wxPasswordEntryDialog: dialog with password control, [ok] and [cancel] +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE 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) + wxDECLARE_NO_COPY_CLASS(wxPasswordEntryDialog); }; // ---------------------------------------------------------------------------- // function to get a string from user // ---------------------------------------------------------------------------- -wxString WXDLLEXPORT -wxGetTextFromUser(const wxString& message, - const wxString& caption = wxGetTextFromUserPromptStr, - const wxString& default_value = wxEmptyString, - wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE); - -wxString WXDLLEXPORT -wxGetPasswordFromUser(const wxString& message, - const wxString& caption = wxGetTextFromUserPromptStr, - const wxString& default_value = wxEmptyString, - wxWindow *parent = (wxWindow *) NULL); +WXDLLIMPEXP_CORE wxString + wxGetTextFromUser(const wxString& message, + const wxString& caption = wxGetTextFromUserPromptStr, + const wxString& default_value = wxEmptyString, + wxWindow *parent = NULL, + wxCoord x = wxDefaultCoord, + wxCoord y = wxDefaultCoord, + bool centre = true); + +WXDLLIMPEXP_CORE wxString + wxGetPasswordFromUser(const wxString& message, + const wxString& caption = wxGetPasswordFromUserPromptStr, + const wxString& default_value = wxEmptyString, + wxWindow *parent = NULL, + wxCoord x = wxDefaultCoord, + wxCoord y = wxDefaultCoord, + bool centre = true); #endif // wxUSE_TEXTDLG -#endif - // __TEXTDLGH_G__ +#endif // _WX_TEXTDLGG_H_