X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84281b92d51cf7cd61dccee4c2399ed110835220..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/apptrait.h?ds=sidebyside

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index b6447ed965..322b047c8e 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -15,20 +15,20 @@
 #include "wx/string.h"
 #include "wx/platinfo.h"
 
-class WXDLLIMPEXP_BASE wxArrayString;
-class WXDLLIMPEXP_BASE wxConfigBase;
-class WXDLLIMPEXP_BASE wxEventLoopBase;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
+class WXDLLIMPEXP_FWD_BASE wxConfigBase;
+class WXDLLIMPEXP_FWD_BASE wxEventLoopBase;
 #if wxUSE_FONTMAP
-    class WXDLLEXPORT wxFontMapper;
+    class WXDLLIMPEXP_FWD_CORE wxFontMapper;
 #endif // wxUSE_FONTMAP
-class WXDLLIMPEXP_BASE wxLog;
-class WXDLLIMPEXP_BASE wxMessageOutput;
-class WXDLLIMPEXP_BASE wxObject;
-class WXDLLEXPORT wxRendererNative;
-class WXDLLIMPEXP_BASE wxStandardPathsBase;
-class WXDLLIMPEXP_BASE wxString;
-class WXDLLIMPEXP_BASE wxTimer;
-class WXDLLIMPEXP_BASE wxTimerImpl;
+class WXDLLIMPEXP_FWD_BASE wxLog;
+class WXDLLIMPEXP_FWD_BASE wxMessageOutput;
+class WXDLLIMPEXP_FWD_BASE wxObject;
+class WXDLLIMPEXP_FWD_CORE wxRendererNative;
+class WXDLLIMPEXP_FWD_BASE wxStandardPathsBase;
+class WXDLLIMPEXP_FWD_BASE wxString;
+class WXDLLIMPEXP_FWD_BASE wxTimer;
+class WXDLLIMPEXP_FWD_BASE wxTimerImpl;
 
 class GSocketGUIFunctionsTable;
 
@@ -73,11 +73,9 @@ public:
     // NB: returned pointer will be deleted by the caller
     virtual wxRendererNative *CreateRenderer() = 0;
 
-#if wxUSE_STDPATHS
     // wxStandardPaths object is normally the same for wxBase and wxGUI
     // except in the case of wxMac and wxCocoa
     virtual wxStandardPathsBase& GetStandardPaths();
-#endif // wxUSE_STDPATHS
 
 #if wxUSE_INTL
     // called during wxApp initialization to set the locale to correspond to
@@ -207,6 +205,10 @@ protected:
 class WXDLLIMPEXP_BASE wxConsoleAppTraitsBase : public wxAppTraits
 {
 public:
+#if !wxUSE_CONSOLE_EVENTLOOP
+    virtual wxEventLoopBase *CreateEventLoop() { return NULL; }
+#endif // !wxUSE_CONSOLE_EVENTLOOP
+
 #if wxUSE_LOG
     virtual wxLog *CreateLogTarget();
 #endif // wxUSE_LOG