X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/551a6c64bb40692f6dd5ae86c309eb22ddfa20c5..42b6a61ef6680602b4893a39e4a42d66bcb2f2a8:/include/wx/mac/frame.h?ds=sidebyside diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h index 39498bd06b..5e2a0be580 100644 --- a/include/wx/mac/frame.h +++ b/include/wx/mac/frame.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: frame.h // Purpose: wxFrame class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FRAME_H_ #define _WX_FRAME_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "frame.h" #endif @@ -60,7 +60,7 @@ public: // ------------------------------- // override some more virtuals - virtual bool Enable(bool enable) ; + virtual bool Enable(bool enable = TRUE) ; // get the origin of the client area (which may be different from (0, 0) // if the frame has a toolbar) in client coordinates @@ -101,6 +101,10 @@ public: wxMacToolTip* m_hwndToolTip ; #endif // tooltips + // 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(); @@ -109,6 +113,9 @@ protected: virtual void DoGetClientSize(int *width, int *height) const; virtual void DoSetClientSize(int width, int height); + virtual void DetachMenuBar(); + virtual void AttachMenuBar(wxMenuBar *menubar); + protected: #if wxUSE_STATUSBAR static bool m_useNativeStatusBar;