added alpha channel support to wxDFB's wxBitmap

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index d9147fdd24423c113a191f180e816d1e6a2cffa5..596c29d3f497426df77f5fb62948e7c7e1e9c950 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -16,15 +16,16 @@
 #include "wx/platinfo.h"
 
 class WXDLLIMPEXP_BASE wxArrayString;
-class WXDLLIMPEXP_BASE wxObject;
-class WXDLLEXPORT wxAppTraits;
+class WXDLLIMPEXP_BASE wxConfigBase;
 class WXDLLIMPEXP_BASE wxEventLoopBase;
 #if wxUSE_FONTMAP
     class WXDLLEXPORT 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;
@@ -36,8 +37,6 @@ class GSocketGUIFunctionsTable;
 // wxAppTraits: this class defines various configurable aspects of wxApp
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxStandardPathsBase;
-
 class WXDLLIMPEXP_BASE wxAppTraitsBase
 {
 public:
@@ -47,6 +46,13 @@ public:
     // 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;
@@ -67,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