X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfbb0b4c77cd55b5d3073ce3392fa4b2fdc39a50..63e2147c8b027645682e0e4cd013a3f30bbd3483:/include/wx/msw/toplevel.h?ds=sidebyside diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h index fab04867f6..2033fb0d4e 100644 --- a/include/wx/msw/toplevel.h +++ b/include/wx/msw/toplevel.h @@ -61,6 +61,7 @@ public: #ifndef __WXWINCE__ virtual bool SetShape(const wxRegion& region); #endif // __WXWINCE__ + virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); virtual bool Show(bool show = true); @@ -81,11 +82,11 @@ public: void SetLastFocus(wxWindow *win) { m_winLastFocused = win; } wxWindow *GetLastFocus() const { return m_winLastFocused; } -#ifdef __SMARTPHONE__ - void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL); - void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL); +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) + virtual void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL); + virtual void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL); bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); -#endif // __SMARTPHONE__ +#endif // __SMARTPHONE__ && __WXWINCE__ protected: // common part of all ctors @@ -129,7 +130,7 @@ protected: // the last focused child: we restore focus to it on activation wxWindow *m_winLastFocused; -#ifdef __SMARTPHONE__ +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) class ButtonMenu { public: @@ -162,7 +163,7 @@ protected: void ReloadButton(ButtonMenu& button, UINT menuID); void ReloadAllButtons(); -#endif // __SMARTPHONE__ +#endif // __SMARTPHONE__ && __WXWINCE__ DECLARE_EVENT_TABLE() DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)