use wxTextEntry in wxTextValidator (modified patch 1821743)

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

diff --git a/include/wx/textentry.h b/include/wx/textentry.h
index d7ba22c10b506f4116eadd92e40852ccabf89425..9ebbdeb5bcc136a040c6344d9898f608abac22fd 100644 (file)
--- a/include/wx/textentry.h
+++ b/include/wx/textentry.h
@@ -144,6 +144,7 @@ protected:
         wxTextEntryBase *m_text;
         bool m_suppress;
     };
         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; }
 
     // return true if the events are currently not suppressed
     bool EventsAllowed() const { return m_eventsBlock == 0; }


@@ -171,15 +172,20 @@ private:
     // initially the generation of the events is enabled
     virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) { }
 
     // 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;
 };
 
     // 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"
     #include "wx/gtk/textentry.h"

+#elif defined(__WXMSW__)
+    #include "wx/msw/textentry.h"

 #else
     // no platform-specific implementation of wxTextEntry yet
     class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
 #else
     // no platform-specific implementation of wxTextEntry yet
     class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase