define wxUTF8Buf as the type returned by wxString::utf8_str()

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 6d6084e3a1199a95c677c19cd035091d6e2436d6..322b047c8eab49ebf57c0111715022baedbf6292 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -15,19 +15,20 @@
 #include "wx/string.h"
 #include "wx/platinfo.h"
 
 #include "wx/string.h"
 #include "wx/platinfo.h"
 

-class WXDLLIMPEXP_BASE wxArrayString;
-class WXDLLIMPEXP_BASE wxObject;
-class WXDLLEXPORT wxAppTraits;
-class WXDLLIMPEXP_BASE wxEventLoop;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
+class WXDLLIMPEXP_FWD_BASE wxConfigBase;
+class WXDLLIMPEXP_FWD_BASE wxEventLoopBase;

 #if wxUSE_FONTMAP
 #if wxUSE_FONTMAP

-    class WXDLLEXPORT wxFontMapper;
+    class WXDLLIMPEXP_FWD_CORE wxFontMapper;

 #endif // wxUSE_FONTMAP
 #endif // wxUSE_FONTMAP

-class WXDLLIMPEXP_BASE wxLog;
-class WXDLLIMPEXP_BASE wxMessageOutput;
-class WXDLLEXPORT wxRendererNative;
-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;
 
 
 class GSocketGUIFunctionsTable;
 


@@ -36,8 +37,6 @@ class GSocketGUIFunctionsTable;
 // wxAppTraits: this class defines various configurable aspects of wxApp
 // ----------------------------------------------------------------------------
 
 // wxAppTraits: this class defines various configurable aspects of wxApp
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_BASE wxStandardPathsBase;
-

 class WXDLLIMPEXP_BASE wxAppTraitsBase
 {
 public:
 class WXDLLIMPEXP_BASE wxAppTraitsBase
 {
 public:


@@ -47,6 +46,13 @@ public:
     // hooks for working with the global objects, may be overridden by the user
     // ------------------------------------------------------------------------
 
     // hooks for working with the global objects, may be overridden by the user
     // ------------------------------------------------------------------------
 

+#if wxUSE_CONFIG
+    // create the default configuration object (base class version is
+    // implemented in config.cpp and creates wxRegConfig for wxMSW and
+    // wxFileConfig for all the other platforms)
+    virtual wxConfigBase *CreateConfig();
+#endif // wxUSE_CONFIG
+

 #if wxUSE_LOG
     // create the default log target
     virtual wxLog *CreateLogTarget() = 0;
 #if wxUSE_LOG
     // create the default log target
     virtual wxLog *CreateLogTarget() = 0;


@@ -67,11 +73,9 @@ public:
     // NB: returned pointer will be deleted by the caller
     virtual wxRendererNative *CreateRenderer() = 0;
 
     // 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();
     // 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
 
 #if wxUSE_INTL
     // called during wxApp initialization to set the locale to correspond to


@@ -122,7 +126,7 @@ public:
 #endif
 
     // create a new, port specific, instance of the event loop used by wxApp
 #endif
 
     // create a new, port specific, instance of the event loop used by wxApp

-    virtual wxEventLoop *CreateEventLoop() = 0;
+    virtual wxEventLoopBase *CreateEventLoop() = 0;

 
 #if wxUSE_TIMER
     // return platform and toolkit dependent wxTimer implementation
 
 #if wxUSE_TIMER
     // return platform and toolkit dependent wxTimer implementation


@@ -201,6 +205,10 @@ protected:
 class WXDLLIMPEXP_BASE wxConsoleAppTraitsBase : public wxAppTraits
 {
 public:
 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
 #if wxUSE_LOG
     virtual wxLog *CreateLogTarget();
 #endif // wxUSE_LOG