More compilation fixes after wxNOEXCEPT introduction.

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

diff --git a/interface/wx/window.h b/interface/wx/window.h
index 29300d796d52b9abd7e1df6765f8fa1766b0fa8f..f7d3a319388b4c9bc8b352a68de37237389c7101 100644 (file)
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -385,6 +385,8 @@ public:
         Returns @true if the window (or in case of composite controls, its main
         child window) has focus.
 
         Returns @true if the window (or in case of composite controls, its main
         child window) has focus.
 

+        @since 2.9.0
+

         @see FindFocus()
     */
     virtual bool HasFocus() const;
         @see FindFocus()
     */
     virtual bool HasFocus() const;


@@ -1923,7 +1925,16 @@ public:
     */
     void SetOwnBackgroundColour(const wxColour& colour);
 
     */
     void SetOwnBackgroundColour(const wxColour& colour);
 

+    /**
+        Return @true if this window inherits the background colour from its parent.
+
+        @see SetOwnBackgroundColour(), InheritAttributes()
+    */

     bool InheritsBackgroundColour() const;
     bool InheritsBackgroundColour() const;

+
+    /**
+        Return @true if a background colour has been set for this window.
+    */

     bool UseBgCol() const;
 
     /**
     bool UseBgCol() const;
 
     /**


@@ -3538,6 +3549,11 @@ protected:
         GetBestSize() returns an arbitrary hardcoded size for the window, so
         you must override it when implementing a custom window class.
 
         GetBestSize() returns an arbitrary hardcoded size for the window, so
         you must override it when implementing a custom window class.
 

+        Notice that the best size returned by this function is cached
+        internally, so if anything that results in the best size changing (e.g.
+        change to the control contents) happens, you need to call
+        InvalidateBestSize() to notify wxWidgets about it.
+

         @see @ref overview_windowsizing
 
         @since 2.9.0
         @see @ref overview_windowsizing
 
         @since 2.9.0