X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6762286db6cf974817dead5b88bebf0e390dbb7e..8d2c70414cc0c6b93147d0c0cc963f217fcb2023:/include/wx/osx/frame.h diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h index 380fbf624e..42c9393748 100644 --- a/include/wx/osx/frame.h +++ b/include/wx/osx/frame.h @@ -23,7 +23,7 @@ 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 +59,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); @@ -77,7 +77,7 @@ public: // Status bar #if wxUSE_STATUSBAR virtual wxStatusBar* OnCreateStatusBar(int number = 1, - long style = wxST_SIZEGRIP, + long style = wxSTB_DEFAULT_STYLE, wxWindowID id = 0, const wxString& name = wxStatusLineNameStr); #endif // wxUSE_STATUSBAR @@ -88,6 +88,9 @@ public: void PositionBars(); + // osx specific event handling common for all osx-ports + virtual void HandleResized( double timestampsec ); + protected: // common part of all ctors void Init(); @@ -108,16 +111,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) };