X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e39af974ef7846e26686ae39d74e4696c1fef0c3..adb799d6ef8e1ba754ab08b26e64fa40219f95f8:/include/wx/x11/textctrl.h diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h index 2dd4196a92..1b8f0143a2 100644 --- 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__