revision contributed by Utensil Candel

[wxWidgets.git] / interface / window.h

diff --git a/interface/window.h b/interface/window.h
index 894a30480314ae0d42a5dd5d83dacc9e30d2d75d..ab5670b7dad4953a755dfa85f70775aeaab9f498 100644 (file)
--- a/interface/window.h
+++ b/interface/window.h
@@ -1381,16 +1381,6 @@ public:
     */
     void Layout();
 
-    /**
-        This is just a wrapper for wxWindow::ScrollLines(1).
-    */
-
-
-    /**
-        This is just a wrapper for wxWindow::ScrollLines(-1).
-    */
-
-
     /**
         Lowers the window to the bottom of the window hierarchy (Z-order).
 
@@ -1508,13 +1498,24 @@ public:
     virtual void OnInternalIdle();
 
     /**
-        This is just a wrapper for wxWindow::ScrollPages(1).
+        Same as #ScrollLines (-1).
     */
+    bool LineUp();
 
+    /**
+        Same as #ScrollLines (1).
+    */
+    bool LineDown();
 
     /**
-        This is just a wrapper for wxWindow::ScrollPages(-1).
+        Same as #ScrollPages (-1).
     */
+    bool PageUp();
+
+    /**
+        Same as #ScrollPages (1).
+    */
+    bool PageDown();
 
 
     /**
@@ -2595,7 +2596,7 @@ public:
 
     /**
         Moves the pointer to the given position on the window.
-        @b NB: This function is not supported under Mac because Apple Human
+        @note This function is not supported under Mac because Apple Human
         Interface Guidelines forbid moving the mouse cursor programmatically.
 
         @param x
@@ -2612,27 +2613,32 @@ public:
 // Global functions/macros
 // ============================================================================
 
-/**
-    Find the deepest window at the given mouse position in screen coordinates,
-    returning the window if found, or @NULL if not.
-*/
-wxWindow* wxFindWindowAtPoint(const wxPoint& pt);
+/** @ingroup group_funcmacro_misc */
+//@{
 
 /**
     Find the deepest window at the mouse pointer position, returning the window
     and current pointer position in screen coordinates.
+
+    @header{wx/window.h}
 */
 wxWindow* wxFindWindowAtPointer(wxPoint& pt);
 
 /**
-    Gets the currently active window (implemented for MSW and GTK only currently,
-    always returns @NULL in the other ports).
+    Gets the currently active window (implemented for MSW and GTK only
+    currently, always returns @NULL in the other ports).
+
+    @header{wx/window.h}
 */
 wxWindow* wxGetActiveWindow();
 
 /**
-    Returns the first top level parent of the given window, or in other words, the
-    frame or dialog containing it, or @NULL.
+    Returns the first top level parent of the given window, or in other words,
+    the frame or dialog containing it, or @NULL.
+
+    @header{wx/window.h}
 */
-wxWindow* wxGetTopLevelParent(wxWindow win);
+wxWindow* wxGetTopLevelParent(wxWindow* window);
+
+//@}