X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/generic/textdlgg.h?ds=sidebyside diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h index 8825d90216..bbd7c70de5 100644 --- a/include/wx/generic/textdlgg.h +++ b/include/wx/generic/textdlgg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: textdlgg.h +// Name: wx/generic/textdlgg.h // Purpose: wxTextEntryDialog class // Author: Julian Smart // Modified by: @@ -9,8 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __TEXTDLGH_G__ -#define __TEXTDLGH_G__ +#ifndef _WX_TEXTDLGG_H_ +#define _WX_TEXTDLGG_H_ #include "wx/defs.h" @@ -20,12 +20,13 @@ #if wxUSE_VALIDATORS #include "wx/valtext.h" +#include "wx/textctrl.h" #endif -class WXDLLEXPORT wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -extern WXDLLEXPORT_DATA(const wxChar*) wxGetTextFromUserPromptStr; -extern WXDLLEXPORT_DATA(const wxChar*) wxGetPasswordFromUserPromptStr; +extern WXDLLIMPEXP_DATA_CORE(const char) wxGetTextFromUserPromptStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxGetPasswordFromUserPromptStr[]; #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY) @@ -33,25 +34,47 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxGetPasswordFromUserPromptStr; // wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTextEntryDialog : public wxDialog +class WXDLLIMPEXP_CORE wxTextEntryDialog : public wxDialog { public: + wxTextEntryDialog() + { + m_textctrl = NULL; + } + wxTextEntryDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxGetTextFromUserPromptStr, const wxString& value = wxEmptyString, long style = wxTextEntryDialogStyle, - const wxPoint& pos = wxDefaultPosition); + const wxPoint& pos = wxDefaultPosition) + { + Create(parent, message, caption, value, style, pos); + } + + bool Create(wxWindow *parent, + const wxString& message, + const wxString& caption = wxGetTextFromUserPromptStr, + const wxString& value = wxEmptyString, + long style = wxTextEntryDialogStyle, + const wxPoint& pos = wxDefaultPosition); void SetValue(const wxString& val); wxString GetValue() const { return m_value; } + void SetMaxLength(unsigned long len); + #if wxUSE_VALIDATORS - void SetTextValidator( wxTextValidator& validator ); - void SetTextValidator( long style = wxFILTER_NONE ); - wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); } + void SetTextValidator( const wxTextValidator& validator ); +#if WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED( void SetTextValidator( long style ) ); #endif - // wxUSE_VALIDATORS + void SetTextValidator( wxTextValidatorStyle style = wxFILTER_NONE ); + wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); } +#endif // wxUSE_VALIDATORS + + virtual bool TransferDataToWindow(); + virtual bool TransferDataFromWindow(); // implementation only void OnOK(wxCommandEvent& event); @@ -64,14 +87,14 @@ 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 WXDLLEXPORT wxPasswordEntryDialog : public wxTextEntryDialog +class WXDLLIMPEXP_CORE wxPasswordEntryDialog : public wxTextEntryDialog { public: wxPasswordEntryDialog(wxWindow *parent, @@ -82,32 +105,31 @@ public: const wxPoint& pos = wxDefaultPosition); private: DECLARE_DYNAMIC_CLASS(wxPasswordEntryDialog) - DECLARE_NO_COPY_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, - wxCoord x = wxDefaultCoord, - wxCoord y = wxDefaultCoord, - bool centre = true); - -wxString WXDLLEXPORT -wxGetPasswordFromUser(const wxString& message, - const wxString& caption = wxGetPasswordFromUserPromptStr, - const wxString& default_value = wxEmptyString, - wxWindow *parent = (wxWindow *) NULL, - wxCoord x = wxDefaultCoord, - wxCoord y = wxDefaultCoord, - bool centre = true); +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_