rename Inside(x,y) parameters to avoid gcc warnings about parameters shadowing member...

[wxWidgets.git] / include / wx / textdlg.h

diff --git a/include/wx/textdlg.h b/include/wx/textdlg.h
index 6e5718805935da32377a27f12863f36669b2e42a..7eb37741fc96fca814c16125dca2ea60622562e3 100644 (file)
--- a/include/wx/textdlg.h
+++ b/include/wx/textdlg.h
@@ -1,11 +1,23 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        textdlg.h
+// Purpose:     wxTextEntryDialog class
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_TEXTDLG_H_BASE_
 #define _WX_TEXTDLG_H_BASE_
 
-#ifdef __WXGTK__
-#include "wx/gtk/textdlg.h"
-#else
 #include "wx/generic/textdlgg.h"
-#endif
 
-#endif
-    // _WX_TEXTDLG_H_BASE_
+#if WXWIN_COMPATIBILITY_2_4
+    // for wxGetNumberFromUser()
+    #include "wx/numdlg.h"
+#endif // WXWIN_COMPATIBILITY_2_4
+
+#endif // _WX_TEXTDLG_H_BASE_
+