more compilation fixes after pen/brush styles changes

[wxWidgets.git] / interface / apptrait.h

diff --git a/interface/apptrait.h b/interface/apptrait.h
index 8abc2f94d3d7c0d856b8a9d087c488f1f18fcab9..0522911b07765c35824e4b214c8c4d755ef8f856 100644 (file)
--- a/interface/apptrait.h
+++ b/interface/apptrait.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        apptrait.h
-// Purpose:     documentation for wxAppTraits class
+// Purpose:     interface of wxAppTraits
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license
@@ -11,34 +11,29 @@
     @wxheader{apptrait.h}
 
     The @b wxAppTraits class defines various configurable aspects of a wxApp.
-    You can access it using wxApp::GetTraits function and you can
-    create your own wxAppTraits overriding the
-    wxApp::CreateTraits function.
+    You can access it using wxApp::GetTraits function and you can create your
+    own wxAppTraits overriding the wxApp::CreateTraits function.
 
     By default, wxWidgets creates a @c wxConsoleAppTraits object for console
-    applications
-    (i.e. those applications linked against wxBase library only - see the
-    @ref overview_librarieslist "Libraries list" page) and a @c wxGUIAppTraits
-    object for GUI
+    applications (i.e. those applications linked against wxBase library only -
+    see the @ref page_libs page) and a @c wxGUIAppTraits object for GUI
     applications.
 
     @library{wxbase}
-    @category{FIXME}
+    @category{appmanagement}
 
-    @seealso
-    @ref overview_wxappoverview "wxApp overview", wxApp
+    @see @ref overview_app, wxApp
 */
 class wxAppTraits
 {
 public:
     /**
         Called by wxWidgets to create the default configuration object for the
-        application. The default version creates a registry-based
-        wxRegConfig class under MSW and
-        wxFileConfig under all other platforms. The
-        wxApp wxApp::GetAppName and
-        wxApp::GetVendorName methods are used to determine the
-        registry key or file name.
+        application. The default version creates a registry-based wxRegConfig
+        class under MSW and wxFileConfig under all other platforms.
+
+        The wxApp::GetAppName and wxApp::GetVendorName methods are used to
+        determine the registry key or file name.
     */
     virtual wxConfigBase* CreateConfig();
 
@@ -48,7 +43,10 @@ public:
     virtual wxFontMapper* CreateFontMapper();
 
     /**
-        Creates the default log target for the application.
+        Creates a wxLog class for the application to use for logging errors.
+        The default implementation returns a new wxLogGui class.
+
+        @see wxLog
     */
     virtual wxLog* CreateLogTarget();
 
@@ -58,11 +56,12 @@ public:
     virtual wxMessageOutput* CreateMessageOutput();
 
     /**
-        Returns the renderer to use for drawing the generic controls (return value may
-        be @NULL
-        in which case the default renderer for the current platform is used);
-        this is used in GUI mode only and always returns @NULL in console.
-        NOTE: returned pointer will be deleted by the caller.
+        Returns the renderer to use for drawing the generic controls (return
+        value may be @NULL in which case the default renderer for the current
+        platform is used); this is used in GUI mode only and always returns @NULL
+        in console.
+
+        @note the returned pointer needs to be deleted by the caller.
     */
     virtual wxRendererNative* CreateRenderer();
 
@@ -73,24 +72,25 @@ public:
         to figure out, which desktop environment is running. The method
         returns an empty string otherwise and on all other platforms.
     */
-    virtual wxString GetDesktopEnvironment();
+    virtual wxString GetDesktopEnvironment() const;
 
     /**
         Returns the wxStandardPaths object for the application.
-        It's normally the same for wxBase and wxGUI except in the case of wxMac and
-        wxCocoa.
+        It's normally the same for wxBase and wxGUI except in the case of wxMac
+        and wxCocoa.
     */
-    virtual wxStandardPaths GetStandardPaths();
+    virtual wxStandardPaths& GetStandardPaths();
 
     /**
         Returns the wxWidgets port ID used by the running program and eventually
         fills the given pointers with the values of the major and minor digits
         of the native toolkit currently used.
+
         The version numbers returned are thus detected at run-time and not compile-time
         (except when this is not possible e.g. wxMotif).
+
         E.g. if your program is using wxGTK port this function will return wxPORT_GTK
-        and
-        put in given pointers the versions of the GTK library in use.
+        and put in given pointers the versions of the GTK library in use.
         See wxPlatformInfo for more details.
     */
     virtual wxPortId GetToolkitVersion(int* major = NULL,
@@ -102,10 +102,10 @@ public:
     virtual bool HasStderr();
 
     /**
-        Returns @true if the library was built as wxUniversal. Always returns
-        @false for wxBase-only apps.
+        Returns @true if the library was built as wxUniversal.
+        Always returns @false for wxBase-only apps.
     */
-    bool IsUsingUniversalWidgets();
+    bool IsUsingUniversalWidgets() const;
 
     /**
         Shows the assert dialog with the specified message in GUI mode or just prints
@@ -114,3 +114,4 @@ public:
     */
     virtual bool ShowAssertDialog(const wxString& msg);
 };
+