X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa2f57be4db838388659fe48dbf5546daf5364f8..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/textentry.h diff --git a/include/wx/textentry.h b/include/wx/textentry.h index 3050074282..9ebbdeb5bc 100644 --- a/include/wx/textentry.h +++ b/include/wx/textentry.h @@ -144,6 +144,7 @@ protected: wxTextEntryBase *m_text; bool m_suppress; }; + friend class EventsSuppressor; // return true if the events are currently not suppressed bool EventsAllowed() const { return m_eventsBlock == 0; } @@ -171,14 +172,17 @@ private: // initially the generation of the events is enabled virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) { } - - friend class EventsSuppressor; - // if this counter is non-null, events are blocked unsigned m_eventsBlock; }; -#ifdef __WXGTK20__ +#ifdef __WXUNIVERSAL__ + // TODO: we need to use wxTextEntryDelegate here, but for now just prevent + // the GTK/MSW classes from being used in wxUniv build + class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase + { + }; +#elif defined(__WXGTK20__) #include "wx/gtk/textentry.h" #elif defined(__WXMSW__) #include "wx/msw/textentry.h"