X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05adb9d2fdc40d8620730be490bf406b8e367cf8..2c1f73eecf5ebf3fb49955bea888ca7355e93c2a:/include/wx/mac/frame.h diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h index 331568d974..4a691898ab 100644 --- a/include/wx/mac/frame.h +++ b/include/wx/mac/frame.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: frame.h -// Purpose: wxFrame class +// Purpose: wxFrameMac class // Author: AUTHOR // Modified by: // Created: ??/??/98 @@ -28,14 +28,14 @@ class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxStatusBar; class WXDLLEXPORT wxMacToolTip ; -class WXDLLEXPORT wxFrame: public wxFrameBase { +class WXDLLEXPORT wxFrameMac: public wxFrameBase { - DECLARE_DYNAMIC_CLASS(wxFrame) + DECLARE_DYNAMIC_CLASS(wxFrameMac) public: // construction - wxFrame() { Init(); } - wxFrame(wxWindow *parent, + wxFrameMac() { Init(); } + wxFrameMac(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -56,7 +56,7 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - virtual ~wxFrame(); + virtual ~wxFrameMac(); // implement base class pure virtuals virtual void Maximize(bool maximize = TRUE); @@ -125,6 +125,8 @@ protected: #if wxUSE_STATUSBAR static bool m_useNativeStatusBar; #endif // wxUSE_STATUSBAR + // the last focused child: we restore focus to it on activation + wxWindow *m_winLastFocused; private: DECLARE_EVENT_TABLE()