removed final traces of wxStAppResource

[wxWidgets.git] / include / wx / x11 / textctrl.h

diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 2dd4196a92e6b2b45971b6432841b76b0a325e49..1b8f0143a2520066a141c8afd077061372f97282 100644 (file)
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -11,12 +11,20 @@
 #ifndef __X11TEXTCTRLH__
 #define __X11TEXTCTRLH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+// Set to 1 to use wxUniv's implementation, 0
+// to use wxX11's.
+#define wxUSE_UNIV_TEXTCTRL 1
+
+#if wxUSE_UNIV_TEXTCTRL
+#include "wx/univ/textctrl.h"
+#else
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "textctrl.h"
 #endif
 
 #include "wx/scrolwin.h"
-#include "wx/dynarray.h"
+#include "wx/arrstr.h"
 #include "wx/datetime.h"
 
 //-----------------------------------------------------------------------------
@@ -93,6 +101,7 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);
+    virtual ~wxTextCtrl();
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -385,5 +394,8 @@ protected:
     wxTextCtrl *m_winCapture;
 };
 
-#endif // __GTKTEXTCTRLH__
+#endif
+// wxUSE_UNIV_TEXTCTRL
+
+#endif // __X11TEXTCTRLH__