fix warnings in EventsSuppressor ctor from gcc with -O option

[wxWidgets.git] / include / wx / generic / textdlgg.h

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index 46883085abcf793d4221992264d10e808d6ba30d..a0f8fbcf3b92c025b97abf133e289b8a397d634f 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -9,26 +9,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TEXTDLGH_G__
-#define __TEXTDLGH_G__
+#ifndef _WX_TEXTDLGG_H_
+#define _WX_TEXTDLGG_H_
 
-#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"
 
 #if wxUSE_VALIDATORS
 #include "wx/valtext.h"
+#include "wx/textctrl.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 +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
@@ -112,5 +110,4 @@ wxGetPasswordFromUser(const wxString& message,
 
 #endif
     // wxUSE_TEXTDLG
-#endif
-    // __TEXTDLGH_G__
+#endif // _WX_TEXTDLGG_H_