Illustrate usage of wxDataViewListCtrl

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

diff --git a/interface/wx/window.h b/interface/wx/window.h
index 8d8bec2cf1c784698fb4686a0e12872313b6914c..71b0f46344ca90590eae1f8c3559944bb647fb8e 100644 (file)
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -657,7 +657,7 @@ public:
 
         @see FindWindow()
     */
-    static wxWindow* FindWindowById(long id, wxWindow* parent = NULL);
+    static wxWindow* FindWindowById(long id, const wxWindow* parent = 0);
 
     /**
         Find a window by its label.
@@ -671,10 +671,10 @@ public:
         @see FindWindow()
     */
     static wxWindow* FindWindowByLabel(const wxString& label,
-                                       wxWindow* parent = NULL);
+                                       const wxWindow* parent = 0);
 
     /**
-        Find a window by its name (as given in a window constructor or @b Create
+        Find a window by its name (as given in a window constructor or Create()
         function call).
 
         If @a parent is @NULL, the search will start from all top-level frames
@@ -687,7 +687,7 @@ public:
         @see FindWindow()
     */
     static wxWindow* FindWindowByName(const wxString& name,
-                                      wxWindow* parent = NULL);
+                                      const wxWindow* parent = 0);
 
     /**
         Sizes the window so that it fits around its subwindows.
@@ -1075,10 +1075,9 @@ public:
         (or toggle or ...) any items which should be disabled in the menu
         before showing it.
 
-        @param menu
-            The menu to show.
-        @param pos
-            The position at which to show the menu in client coordinates.
+        The parameter @a menu is the menu to show.
+        The parameter @a pos (or the parameters @a x and @a y) is the
+        position at which to show the menu in client coordinates.
 
         @return
              The selected menu item id or @c wxID_NONE if none selected or an
@@ -1278,11 +1277,14 @@ public:
     */
     virtual wxSize GetWindowBorderSize() const;
 
+    //@{
     /**
-        Gets the window style that was passed to the constructor or @b Create
-        method. @b GetWindowStyle() is another name for the same function.
+        Gets the window style that was passed to the constructor or Create()
+        method. GetWindowStyle() is another name for the same function.
     */
     virtual long GetWindowStyleFlag() const;
+    long GetWindowStyle() const;
+    //@}
 
     /**
         Returns the value previously passed to SetWindowVariant().
@@ -2553,11 +2555,7 @@ public:
     void SetVirtualSize(const wxSize& size);
     //@}
 
-    /**
-        Identical to SetWindowStyleFlag().
-    */
-    void SetWindowStyle(long style);
-
+    //@{
     /**
         Sets the style of the window. Please note that some styles cannot be changed
         after the window creation and that Refresh() might need to be be called
@@ -2568,6 +2566,8 @@ public:
         @see GetWindowStyleFlag()
     */
     virtual void SetWindowStyleFlag(long style);
+    void SetWindowStyle(long style);
+    //@}
 
     /**
         This function can be called under all platforms but only does anything under
@@ -2823,7 +2823,7 @@ protected:
 // Global functions/macros
 // ============================================================================
 
-/** @ingroup group_funcmacro_misc */
+/** @addtogroup group_funcmacro_misc */
 //@{
 
 /**