Document wxKill(wxSIGTERM) reliance on having an open window in wxMSW.

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

diff --git a/include/wx/window.h b/include/wx/window.h
index 8376fb773152dbf24470ccbddad5de7a45c241d7..a8f757037b0d7917d4b3155df0def00734daea5e 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -521,9 +521,9 @@ public:
         return wxSize( wxMax( client.x, best.x ), wxMax( client.y, best.y ) );
     }
 
-    // returns the magnification of the backing store of this window
+    // returns the magnification of the content of this window
     // eg 2.0 for a window on a retina screen
-    virtual double GetMagnificationFactor() const
+    virtual double GetContentScaleFactor() const
     { return 1.0; }
     
     // return the size of the left/right and top/bottom borders in x and y
@@ -724,8 +724,13 @@ public:
     virtual bool AcceptsFocusFromKeyboard() const { return AcceptsFocus(); }
 
 
-        // this is mostly a helper for the various functions using it below
-    bool CanBeFocused() const { return IsShown() && IsEnabled(); }
+        // Can this window be focused right now, in its current state? This
+        // shouldn't be called at all if AcceptsFocus() returns false.
+        //
+        // It is a convenient helper for the various functions using it below
+        // but also a hook allowing to override the default logic for some rare
+        // cases (currently just wxRadioBox in wxMSW) when it's inappropriate.
+    virtual bool CanBeFocused() const { return IsShown() && IsEnabled(); }
 
         // can this window itself have focus?
     bool IsFocusable() const { return AcceptsFocus() && CanBeFocused(); }