X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f618020a15f1647a83aaeab1fe315f90497a9876..f99422e9e916202c36a62534236d2288aae435c7:/include/wx/msw/toplevel.h diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h index 85bf00c072..213538d3c1 100644 --- a/include/wx/msw/toplevel.h +++ b/include/wx/msw/toplevel.h @@ -12,7 +12,7 @@ #ifndef _WX_MSW_TOPLEVEL_H_ #define _WX_MSW_TOPLEVEL_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "toplevel.h" #endif @@ -58,6 +58,8 @@ public: virtual void SetIcons(const wxIconBundle& icons ); virtual void Restore(); + virtual bool SetShape(const wxRegion& region); + virtual bool Show(bool show = TRUE); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); @@ -70,6 +72,13 @@ public: // implementation from now on // -------------------------- + // event handlers + void OnActivate(wxActivateEvent& event); + + // called by wxWindow whenever it gets focus + void SetLastFocus(wxWindow *win) { m_winLastFocused = win; } + wxWindow *GetLastFocus() const { return m_winLastFocused; } + protected: // common part of all ctors void Init(); @@ -92,7 +101,10 @@ protected: // translate wxWindows flags to Windows ones virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const; - // is the frame currently iconized? + // choose the right parent to use with CreateWindow() + virtual WXHWND MSWGetParent() const; + + // is the window currently iconized? bool m_iconized; // should the frame be maximized when it will be shown? set by Maximize() @@ -105,6 +117,12 @@ protected: long m_fsOldWindowStyle; bool m_fsIsMaximized; bool m_fsIsShowing; + + // the last focused child: we restore focus to it on activation + wxWindow *m_winLastFocused; + + DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW) }; // list of all frames and modeless dialogs