X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/326d5a744fc79c31d3fe0acaf175bd1d9cf4ae07..807c0706e65d6d67b15d2acc53b0d41b6654c711:/src/mac/carbon/frame.cpp diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index ac1391d4de..5e1cc74cd9 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -9,10 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "frame.h" #endif +#include "wx/wxprec.h" + #include "wx/frame.h" #include "wx/statusbr.h" #include "wx/toolbar.h" @@ -249,6 +251,21 @@ void wxFrame::DoGetClientSize(int *x, int *y) const #endif // wxUSE_TOOLBAR } +bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const +{ +#if wxUSE_STATUSBAR + if ( child == GetStatusBar() ) + return false ; +#endif // wxUSE_STATUSBAR + +#if wxUSE_TOOLBAR + if ( child == GetToolBar() ) + return false ; +#endif // wxUSE_TOOLBAR + + return wxFrameBase::MacIsChildOfClientArea( child ) ; +} + void wxFrame::DoSetClientSize(int clientwidth, int clientheight) { int currentclientwidth , currentclientheight ;