X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4c178c10d070e20d537f3d685a31115b3b2d4c9..f5fac4471b361f54ae6a09f6047ae4dbe30fcb86:/include/wx/osx/frame.h diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h index be5e40f6ee..eaea567261 100644 --- a/include/wx/osx/frame.h +++ b/include/wx/osx/frame.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: frame.h +// Name: wx/osx/frame.h // Purpose: wxFrame class // Author: Stefan Csomor // Modified by: @@ -12,18 +12,13 @@ #ifndef _WX_FRAME_H_ #define _WX_FRAME_H_ -#include "wx/window.h" #include "wx/toolbar.h" #include "wx/accel.h" #include "wx/icon.h" -WXDLLIMPEXP_DATA_CORE(extern const char) wxToolBarNameStr[]; - -class WXDLLIMPEXP_FWD_CORE wxMenuBar; -class WXDLLIMPEXP_FWD_CORE wxStatusBar; class WXDLLIMPEXP_FWD_CORE wxMacToolTip ; -class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase { public: // construction @@ -59,7 +54,7 @@ public: virtual wxPoint GetClientAreaOrigin() const; // override some more virtuals - virtual bool Enable(bool enable = TRUE) ; + virtual bool Enable(bool enable = true) ; // event handlers void OnActivate(wxActivateEvent& event); @@ -88,6 +83,9 @@ public: void PositionBars(); + // internal response to size events + virtual void MacOnInternalSize() { PositionBars(); } + protected: // common part of all ctors void Init(); @@ -108,16 +106,11 @@ protected: virtual void AttachMenuBar(wxMenuBar *menubar); #endif - // osx specific event handling common for all osx-ports - virtual void HandleResized( double timestampsec ); - -protected: // the last focused child: we restore focus to it on activation wxWindow *m_winLastFocused; virtual bool MacIsChildOfClientArea( const wxWindow* child ) const ; -private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxFrame) };