added wxGetX11Display() returning the pointer of the correct type, unlike the old...

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

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 964413cde7f6e309b21522d0d102d4f080e69943..4a59ace1f6776ed16dea45d9b83ebbfa8c3abb9c 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -23,8 +23,6 @@ public:
     virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
     virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
     virtual int WaitForChild(wxExecuteData& execData);
-
-    virtual wxToolkitInfo& GetToolkitInfo();
 };
 
 #if wxUSE_GUI
@@ -40,7 +38,16 @@ public:
 #if defined(__WXMAC__) || defined(__WXCOCOA__)
     virtual wxStandardPathsBase& GetStandardPaths();
 #endif
-    virtual wxToolkitInfo& GetToolkitInfo();
+    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+
+#ifdef __WXGTK__
+    virtual void SetLocale();
+    virtual wxString GetDesktopEnvironment() const;
+#endif
+
+#if defined(__WXDEBUG__) && defined(__WXGTK20__)
+    virtual bool ShowAssertDialog(const wxString& msg);
+#endif
 };
 
 #endif // wxUSE_GUI