#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"
//-----------------------------------------------------------------------------
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxTextCtrlNameStr);
+ virtual ~wxTextCtrl();
bool Create(wxWindow *parent,
wxWindowID id,
// more readable flag testing methods
// ----------------------------------
+#if 0
+ // it seems now in wxTextCtrlBase
bool IsSingleLine() const { return !(GetWindowStyle() & wxTE_MULTILINE); }
+#endif
bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; }
- bool WrapLines() const { return FALSE; }
+ bool WrapLines() const { return false; }
// If the return values from and to are the same, there is no selection.
virtual void GetSelection(long* from, long* to) const;
wxTextCtrl *m_winCapture;
};
-#endif // __GTKTEXTCTRLH__
+#endif
+// wxUSE_UNIV_TEXTCTRL
+
+#endif // __X11TEXTCTRLH__