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)
// 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,
#if wxUSE_VALIDATORS
void SetTextValidator( const wxTextValidator& validator );
- void SetTextValidator( long style = wxFILTER_NONE );
+#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
// wxPasswordEntryDialog: dialog with password control, [ok] and [cancel]
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxPasswordEntryDialog : public wxTextEntryDialog
+class WXDLLIMPEXP_CORE wxPasswordEntryDialog : public wxTextEntryDialog
{
public:
wxPasswordEntryDialog(wxWindow *parent,
// 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