fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

[wxWidgets.git] / include / wx / unix / apptrait.h

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 229ae70b3c3fdfd70a5a2eda100417928f8e9443..fe5639731ad3024b1b0095e0de15a875c9e94b24 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -16,10 +16,12 @@
 // wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
+class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
+#if wxUSE_CONSOLE_EVENTLOOP
     virtual wxEventLoopBase *CreateEventLoop();
+#endif // wxUSE_CONSOLE_EVENTLOOP
     virtual bool CreateEndProcessPipe(wxExecuteData& execData);
     virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
     virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
@@ -42,6 +44,10 @@ public:
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
+#if wxUSE_THREADS && defined(__WXGTK20__)
+    virtual void MutexGuiEnter();
+    virtual void MutexGuiLeave();
+#endif
 
 #if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
     virtual wxStandardPathsBase& GetStandardPaths();
@@ -61,6 +67,17 @@ public:
 #if defined(__WXDEBUG__) && defined(__WXGTK20__)
     virtual bool ShowAssertDialog(const wxString& msg);
 #endif
+
+    // GTK+ and Motif integrate sockets directly in their main loop, the other
+    // Unix ports do it at wxEventLoop level
+    //
+    // TODO: Should we use XtAddInput() for wxX11 too? Or, vice versa, if there
+    //       is no advantage in doing this compared to the generic way
+    //       currently used by wxX11, should we continue to use GTK/Motif-
+    //       specific stuff?
+#if wxUSE_SOCKETS && (defined(__WXGTK__) || defined(__WXMOTIF__))
+    virtual GSocketManager *GetSocketManager();
+#endif
 };
 
 #endif // wxUSE_GUI