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 88a65fbd9bd1f5568961b51a965ba071d4082f31..a0f8fbcf3b92c025b97abf133e289b8a397d634f 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __TEXTDLGH_G__
-#define __TEXTDLGH_G__
+#ifndef _WX_TEXTDLGG_H_
+#define _WX_TEXTDLGG_H_

 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 


@@ -20,9 +20,10 @@
 
 #if wxUSE_VALIDATORS
 #include "wx/valtext.h"
 
 #if wxUSE_VALIDATORS
 #include "wx/valtext.h"

+#include "wx/textctrl.h"

 #endif
 
 #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[];


@@ -109,5 +110,4 @@ wxGetPasswordFromUser(const wxString& message,
 
 #endif
     // wxUSE_TEXTDLG
 
 #endif
     // wxUSE_TEXTDLG

-#endif
-    // __TEXTDLGH_G__
+#endif // _WX_TEXTDLGG_H_