STL compilation fix

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

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 67e903bdaa3f19f2f1f0fabeab90810e9add3757..229ae70b3c3fdfd70a5a2eda100417928f8e9443 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -19,10 +19,14 @@
 class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
+    virtual wxEventLoopBase *CreateEventLoop();
     virtual bool CreateEndProcessPipe(wxExecuteData& execData);
     virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
     virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
     virtual int WaitForChild(wxExecuteData& execData);
+#if wxUSE_TIMER
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
+#endif
 };
 
 #if wxUSE_GUI
@@ -30,19 +34,29 @@ public:
 class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
+    virtual wxEventLoopBase *CreateEventLoop();
     virtual bool CreateEndProcessPipe(wxExecuteData& execData);
     virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
     virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
     virtual int WaitForChild(wxExecuteData& execData);
+#if wxUSE_TIMER
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
+#endif
 
-#if defined(__WXMAC__) || defined(__WXCOCOA__)
+#if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
     virtual wxStandardPathsBase& GetStandardPaths();
 #endif
     virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
 
-#ifdef __WXGTK__
+#if defined(__WXGTK__) && wxUSE_INTL
+    virtual void SetLocale();
+#endif // __WXGTK__
+
+#ifdef __WXGTK20__
     virtual wxString GetDesktopEnvironment() const;
-#endif
+    virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
+                                               wxArrayString& desc) const;
+#endif // __WXGTK20____
 
 #if defined(__WXDEBUG__) && defined(__WXGTK20__)
     virtual bool ShowAssertDialog(const wxString& msg);