adding an autorelease capability (got weird crashes when deleting tools from a toolba...

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

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 30b96497c1122863374e026cc8f9e909ae690b67..67e903bdaa3f19f2f1f0fabeab90810e9add3757 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     23.06.2003
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     23.06.2003
 // RCS-ID:      $Id$

-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -19,12 +19,10 @@
 class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
 class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:

-    virtual bool CreateEndProcessPipe();
+    virtual bool CreateEndProcessPipe(wxExecuteData& execData);

     virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
     virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
     virtual int WaitForChild(wxExecuteData& execData);
     virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
     virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
     virtual int WaitForChild(wxExecuteData& execData);

-
-    virtual int GetOSVersion(int *verMaj, int *verMin);

 };
 
 #if wxUSE_GUI
 };
 
 #if wxUSE_GUI


@@ -37,7 +35,18 @@ public:
     virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
     virtual int WaitForChild(wxExecuteData& execData);
 
     virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
     virtual int WaitForChild(wxExecuteData& execData);
 

-    virtual int GetOSVersion(int *verMaj, int *verMin);
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+    virtual wxStandardPathsBase& GetStandardPaths();
+#endif
+    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+
+#ifdef __WXGTK__
+    virtual wxString GetDesktopEnvironment() const;
+#endif
+
+#if defined(__WXDEBUG__) && defined(__WXGTK20__)
+    virtual bool ShowAssertDialog(const wxString& msg);
+#endif

 };
 
 #endif // wxUSE_GUI
 };
 
 #endif // wxUSE_GUI