include wxchar.h from string.h in 2.8 compatibility mode to prevent lots of compilati...

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

diff --git a/include/wx/window.h b/include/wx/window.h
index 2dde62f41fe18e06dd5d7fd6dcc4113be83618c0..91a1ac180de645a72d97ebae58c164b604395a32 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -546,6 +546,8 @@ public:
     virtual void SetExtraStyle(long exStyle) { m_exStyle = exStyle; }
     long GetExtraStyle() const { return m_exStyle; }
 
+    bool HasExtraStyle(int exFlag) const { return (m_exStyle & exFlag) != 0; }
+
         // make the window modal (all other windows unresponsive)
     virtual void MakeModal(bool modal = true);
 
@@ -592,6 +594,9 @@ public:
     bool CanAcceptFocusFromKeyboard() const
         { return AcceptsFocusFromKeyboard() && CanAcceptFocus(); }
 
+        // call this when the return value of AcceptsFocus() changes
+    virtual void SetCanFocus(bool WXUNUSED(canFocus)) { }
+
         // navigates inside this window
     bool NavigateIn(int flags = wxNavigationKeyEvent::IsForward)
         { return DoNavigateIn(flags); }
@@ -1122,7 +1127,7 @@ public:
     void SetAccessible(wxAccessible* accessible) ;
 
     // Returns the accessible object.
-    wxAccessible* GetAccessible() { return m_accessible; };
+    wxAccessible* GetAccessible() { return m_accessible; }
 
     // Returns the accessible object, creating if necessary.
     wxAccessible* GetOrCreateAccessible() ;