Fixed floating image layout when typing in subsequent paragraph

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

diff --git a/interface/wx/window.h b/interface/wx/window.h
index 524605b00411608811b084d2405475e8ea8e0712..0e8eb7d87fb56ea9aa61943978d703122a37cc84 100644 (file)
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -493,6 +493,23 @@ public:
         @see GetNextSibling()
     */
     wxWindow* GetPrevSibling() const;
+
+    /**
+        Check if the specified window is a descendant of this one.
+
+        Returns @true if the window is a descendant (i.e. a child or
+        grand-child or grand-grand-child or ...) of this one.
+
+        Notice that a window can never be a descendant of another one if they
+        are in different top level windows, i.e. a child of a wxDialog is not
+        considered to be a descendant of dialogs parent wxFrame.
+
+        @param win Any window, possible @NULL (@false is always returned then).
+
+        @since 2.9.4
+     */
+    bool IsDescendant(wxWindowBase* win) const;
+
     /**
         Reparents the window, i.e. the window will be removed from its
         current parent window (e.g. a non-standard toolbar in a wxFrame)
@@ -1398,12 +1415,6 @@ public:
             A pointer to a integer value for the y coordinate. Pass the client
             coordinate in, and a screen coordinate will be passed out.
 
-        @beginWxPythonOnly
-        In place of a single overloaded method name, wxPython implements the following methods:
-            - ClientToScreen(point): Accepts and returns a wxPoint
-            - ClientToScreenXY(x, y): Returns a 2-tuple, (x, y)
-        @endWxPythonOnly
-
         @beginWxPerlOnly
         In wxPerl this method returns a 2-element list instead of
         modifying its parameters.
@@ -3148,6 +3159,9 @@ public:
     */
     virtual bool IsDoubleBuffered() const;
 
+    /**
+       Turn on or off double buffering of the window if the system supports it.
+    */
     void SetDoubleBuffered(bool on);
 
     /**
@@ -3172,17 +3186,6 @@ public:
     */
     virtual bool IsTopLevel() const;
 
-    /**
-        Disables all other windows in the application so that
-        the user can only interact with this window.
-
-        @param modal
-            If @true, this call disables all other windows in the application so that
-            the user can only interact with this window. If @false, the effect is
-            reversed.
-    */
-    virtual void MakeModal(bool modal = true);
-
     
     /**
         This virtual function is normally only used internally, but