X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..44c87b7d15d5c1f5926beffa4cd5c9d1d2045e04:/include/wx/generic/textdlgg.h diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h index 8825d90216..5fd6056dda 100644 --- a/include/wx/generic/textdlgg.h +++ b/include/wx/generic/textdlgg.h @@ -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,7 +34,7 @@ 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(wxWindow *parent, @@ -47,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 @@ -71,7 +72,7 @@ private: // wxPasswordEntryDialog: dialog with password control, [ok] and [cancel] // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPasswordEntryDialog : public wxTextEntryDialog +class WXDLLIMPEXP_CORE wxPasswordEntryDialog : public wxTextEntryDialog { public: wxPasswordEntryDialog(wxWindow *parent, @@ -89,25 +90,24 @@ private: // 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 = (wxWindow *) 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 = (wxWindow *) NULL, + wxCoord x = wxDefaultCoord, + wxCoord y = wxDefaultCoord, + bool centre = true); #endif // wxUSE_TEXTDLG -#endif - // __TEXTDLGH_G__ +#endif // _WX_TEXTDLGG_H_