X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55b46fd164e36b063ee924e8a433f6b0f876dc70..6798451bb28561eb2e903ff43a9fa572824145a2:/include/wx/generic/textdlgg.h?ds=inline diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h index 46883085ab..f27c49d5c5 100644 --- a/include/wx/generic/textdlgg.h +++ b/include/wx/generic/textdlgg.h @@ -12,12 +12,9 @@ #ifndef __TEXTDLGH_G__ #define __TEXTDLGH_G__ -#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" @@ -25,10 +22,10 @@ #include "wx/valtext.h" #endif -class WXDLLEXPORT wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxGetPasswordFromUserPromptStr; +extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[]; +extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[]; #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY) @@ -50,7 +47,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