Use wxWebKitCtrlNameStr to adhere to the convention used by other wx classes.

[wxWidgets.git] / include / wx / gtk / evtloop.h

diff --git a/include/wx/gtk/evtloop.h b/include/wx/gtk/evtloop.h
index d6e632fa7c1fcbcbfefc5d85f3821a32ea160e06..d08356786232838577439ce8d9736ff1e91e6937 100644 (file)
--- a/include/wx/gtk/evtloop.h
+++ b/include/wx/gtk/evtloop.h
@@ -17,17 +17,9 @@
 
 typedef union  _GdkEvent        GdkEvent;
 
-#if wxUSE_EVENTLOOP_SOURCE
-// maps event loop sources to gtk source ids
-WX_DECLARE_HASH_MAP(wxUnixEventLoopSource*, int, wxPointerHash, wxPointerEqual,
-                    wxEventLoopSourceIdMap);
-#endif
-
-class WXDLLIMPEXP_BASE wxGUIEventLoop : public wxEventLoopBase
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase
 {
 public:
-    typedef wxUnixEventLoopSource Source;
-
     wxGUIEventLoop();
 
     virtual int Run();
@@ -38,33 +30,15 @@ public:
     virtual void WakeUp();
     virtual bool YieldFor(long eventsToProcess);
 
-    void StoreGdkEventForLaterProcessing(GdkEvent* ev)
-        { m_arrGdkEvents.Add(ev); }
-
 #if wxUSE_EVENTLOOP_SOURCE
-    virtual wxUnixEventLoopSource* CreateSource() const
-    {
-        return new wxUnixEventLoopSource();
-    }
+    virtual wxEventLoopSource *
+      AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
+#endif // wxUSE_EVENTLOOP_SOURCE
 
-    virtual wxUnixEventLoopSource* CreateSource(int res,
-                                           wxEventLoopSourceHandler* handler,
-                                           int flags) const
-    {
-        return new wxUnixEventLoopSource(res, handler, flags);
-    }
-#endif
-
-protected:
-#if wxUSE_EVENTLOOP_SOURCE
-    // adding/removing sources
-    virtual bool DoAddSource(wxAbstractEventLoopSource* source);
-    virtual bool DoRemoveSource(wxAbstractEventLoopSource* source);
-
-    // map of event loop sources gtk ids
-    wxEventLoopSourceIdMap m_sourceIdMap;
-#endif
+    void StoreGdkEventForLaterProcessing(GdkEvent* ev)
+        { m_arrGdkEvents.Add(ev); }
 
+private:
     // the exit code of this event loop
     int m_exitcode;