X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d248a65cdd75230f16f29a7689b9d8c40498decb..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/textdlgg.h

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index a2c34a8052..a0f8fbcf3b 100644
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -9,12 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TEXTDLGH_G__
-#define __TEXTDLGH_G__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "textdlgg.h"
-#endif
+#ifndef _WX_TEXTDLGG_H_
+#define _WX_TEXTDLGG_H_
 
 #include "wx/defs.h"
 
@@ -24,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 WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[];
 
 #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)
 
@@ -51,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
@@ -113,5 +110,4 @@ wxGetPasswordFromUser(const wxString& message,
 
 #endif
     // wxUSE_TEXTDLG
-#endif
-    // __TEXTDLGH_G__
+#endif // _WX_TEXTDLGG_H_