don't place NULL pointers in the GDK window array in GTKGetWindow()

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

diff --git a/interface/wx/apptrait.h b/interface/wx/apptrait.h
index 0df97f5c6e047a42d711daec504895b351c44cea..57c2b6d58603bdda7a73fda43373a232ef2e803a 100644 (file)
--- a/interface/wx/apptrait.h
+++ b/interface/wx/apptrait.h
@@ -23,7 +23,7 @@
     implementation of the wxAppTraits interface.
 
     @library{wxbase}
-    @category{appmanagement}
+    @category{cfg}
 
     @see @ref overview_app, wxApp
 */
@@ -40,6 +40,17 @@ public:
     */
     virtual wxConfigBase* CreateConfig();
 
+    /**
+        Used by wxWidgets to create the main event loop used by wxApp::OnRun().
+
+        The default implementation of this method in wxGUIAppTraits returns the
+        usual platform-specific GUI event loop. The version in wxConsoleAppTraits
+        returns a console-specific event loop which can be used to handle timer
+        and socket events in console programs under Unix and MSW or @NULL under
+        the other platforms where console event loops are not supported yet.
+     */
+    virtual wxEventLoopBase *CreateEventLoop() = 0;
+
     /**
         Creates the global font mapper object used for encodings/charset mapping.
     */
@@ -82,12 +93,11 @@ public:
         It's normally the same for wxBase and wxGUI except in the case of wxMac
         and wxCocoa.
 
-        @todo the real function returns a reference to wxStandardPathsBase;
-              user looking at these docs will write code:
-                    wxStandardPaths &ref = ...->GetStandardPaths();
-              which won't compile...
+        @note
+        The returned reference is to a @c wxStandardPathsBase class but you
+        can consider it to be equivalent to wxStandardPaths (which is documented).
     */
-    virtual wxStandardPaths& GetStandardPaths();
+    virtual wxStandardPathsBase& GetStandardPaths();
 
     /**
         Returns the wxWidgets port ID used by the running program and eventually