Remove wrong const from wxMenu::GetMenuItems() documentation.

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

diff --git a/interface/wx/window.h b/interface/wx/window.h
index 7228e0edcb394638b9bbe59531c899b1c590e60d..89d34bd2fd87604306b1722dc99576ab4dd55ee3 100644 (file)
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -53,18 +53,21 @@ enum wxShowEffect
 
 
 /**
 
 
 /**

-   struct containing all the visual attributes of a control
+    Struct containing all the visual attributes of a control.

 */
 struct  wxVisualAttributes
 {
 */
 struct  wxVisualAttributes
 {

-    // the font used for control label/text inside it
+    /// The font used for control label/text inside it.

     wxFont font;
 
     wxFont font;
 

-    // the foreground colour
+    /// The foreground colour.

     wxColour colFg;
 
     wxColour colFg;
 

-    // the background colour, may be wxNullColour if the controls background
-    // colour is not solid
+    /**
+        The background colour.
+
+        May be wxNullColour if the controls background colour is not solid.
+     */

     wxColour colBg;
 };
 
     wxColour colBg;
 };
 


@@ -490,6 +493,23 @@ public:
         @see GetNextSibling()
     */
     wxWindow* GetPrevSibling() const;
         @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)
     /**
         Reparents the window, i.e. the window will be removed from its
         current parent window (e.g. a non-standard toolbar in a wxFrame)


@@ -1755,11 +1775,57 @@ public:
         @c wxBG_STYLE_PAINT is a simpler and more efficient solution to the same
         problem.
 
         @c wxBG_STYLE_PAINT is a simpler and more efficient solution to the same
         problem.
 

+
+        Under wxGTK and wxOSX, you can use ::wxBG_STYLE_TRANSPARENT to obtain
+        full transparency of the window background. Note that wxGTK supports
+        this only since GTK 2.12 with a compositing manager enabled, call
+        IsTransparentBackgroundSupported() to check whether this is the case.
+
+        Also, on order for @c SetBackgroundStyle(wxBG_STYLE_TRANSPARENT) to
+        work, it must be called before Create(). If you're using your own
+        wxWindow-derived class you should write your code in the following way:
+        @code
+            class MyWidget : public wxWindow
+            {
+            public:
+                MyWidget(wxWindow* parent, ...)
+                    : wxWindow() // Use default ctor here!
+                {
+                    // Do this first:
+                    SetBackgroundStyle(wxBG_STYLE_TRANSPARENT);
+
+                    // And really create the window afterwards:
+                    Create(parent, ...);
+                }
+            };
+        @endcode
+

         @see SetBackgroundColour(), GetForegroundColour(),
         @see SetBackgroundColour(), GetForegroundColour(),

-             SetTransparent()
+             SetTransparent(), IsTransparentBackgroundSupported()

     */
     virtual bool SetBackgroundStyle(wxBackgroundStyle style);
 
     */
     virtual bool SetBackgroundStyle(wxBackgroundStyle style);
 

+    /**
+        Checks whether using transparent background might work.
+
+        If this function returns @false, calling SetBackgroundStyle() with
+        ::wxBG_STYLE_TRANSPARENT is not going to work. If it returns @true,
+        setting transparent style should normally succeed.
+
+        Notice that this function would typically be called on the parent of a
+        window you want to set transparent background style for as the window
+        for which this method is called must be fully created.
+
+        @param reason
+            If not @NULL, a reason message is provided if transparency is not
+            supported.
+
+        @return @true if background transparency is supported.
+
+        @since 2.9.4
+    */
+    virtual bool IsTransparentBackgroundSupported(wxString *reason = NULL) const;
+

     /**
         Sets the font for this window. This function should not be called for the
         parent window if you don't want its font to be inherited by its children,
     /**
         Sets the font for this window. This function should not be called for the
         parent window if you don't want its font to be inherited by its children,


@@ -3123,17 +3189,6 @@ public:
     */
     virtual bool IsTopLevel() const;
 
     */
     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
     
     /**
         This virtual function is normally only used internally, but