changes to make wxWindow::FindFocus work as expected with composite controls

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

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 89fcba6c0dd31fa04d44620294ea1cf8e18b0956..d4337bc783db176997605bd598a25b484a6351ed 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -174,11 +174,16 @@ public:
     // Attracts the users attention to this window if the application is
     // inactive (should be called when a background event occurs)
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
     // Attracts the users attention to this window if the application is
     // inactive (should be called when a background event occurs)
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);

-    
+

     // Is this the active frame (highlighted in the taskbar)?
     // Is this the active frame (highlighted in the taskbar)?

-    virtual bool HasFocus()
+    virtual bool IsActive()

         { return (wxGetTopLevelParent(FindFocus()) == this); }
 
         { return (wxGetTopLevelParent(FindFocus()) == this); }
 

+#if defined(__SMARTPHONE__)
+    virtual void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL) = 0;
+    virtual void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL) = 0;
+#endif // __SMARTPHONE__
+

     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------