X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfbb0b4c77cd55b5d3073ce3392fa4b2fdc39a50..d8fd7acb8b877599b410e07a4c26dde92a676a82:/include/wx/msw/toplevel.h diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h index fab04867f6..c0abd56498 100644 --- a/include/wx/msw/toplevel.h +++ b/include/wx/msw/toplevel.h @@ -12,10 +12,6 @@ #ifndef _WX_MSW_TOPLEVEL_H_ #define _WX_MSW_TOPLEVEL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "toplevel.h" -#endif - // ---------------------------------------------------------------------------- // wxTopLevelWindowMSW // ---------------------------------------------------------------------------- @@ -61,6 +57,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 +78,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 +126,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 +159,7 @@ protected: void ReloadButton(ButtonMenu& button, UINT menuID); void ReloadAllButtons(); -#endif // __SMARTPHONE__ +#endif // __SMARTPHONE__ && __WXWINCE__ DECLARE_EVENT_TABLE() DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)