X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d1a4878f36ba4b5f66c2ccfd2cb27a9dc528b6f..08dd04d0829cd2c4defe5233f061221d534dee0d:/src/mac/carbon/frame.cpp?ds=sidebyside diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index d7cc70101e..756166a792 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -30,7 +30,6 @@ extern wxWindowList wxModelessWindows; extern wxList wxPendingDelete; -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_ACTIVATE(wxFrame::OnActivate) // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) @@ -40,9 +39,8 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) -#endif -#define WX_MAC_STATUSBAR_HEIGHT 18 +#define WX_MAC_STATUSBAR_HEIGHT 18 // ---------------------------------------------------------------------------- // creation/destruction // ---------------------------------------------------------------------------- @@ -50,15 +48,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) void wxFrame::Init() { m_frameMenuBar = NULL; - + #if wxUSE_TOOLBAR m_frameToolBar = NULL ; #endif m_frameStatusBar = NULL; m_winLastFocused = NULL ; - - m_iconized = FALSE; - + + m_iconized = false; + #if wxUSE_TOOLTIPS m_hwndToolTip = 0; #endif @@ -72,18 +70,18 @@ bool wxFrame::Create(wxWindow *parent, long style, const wxString& name) { - + if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) - return FALSE; - + return false; + wxModelessWindows.Append(this); - - return TRUE; + + return true; } wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; DeleteAllBars(); } @@ -91,18 +89,18 @@ wxFrame::~wxFrame() bool wxFrame::Enable(bool enable) { if ( !wxWindow::Enable(enable) ) - return FALSE; + return false; if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() ) { - int iMaxMenu = m_frameMenuBar->GetMenuCount(); + int iMaxMenu = m_frameMenuBar->GetMenuCount(); for ( int i = 0 ; i < iMaxMenu ; ++ i ) { m_frameMenuBar->EnableTop( i , enable ) ; } } - return TRUE; + return true; } wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, @@ -123,7 +121,7 @@ void wxFrame::PositionStatusBar() { int w, h; GetClientSize(&w, &h); - + // Since we wish the status bar to be directly under the client area, // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS. m_frameStatusBar->SetSize(0, h, w, WX_MAC_STATUSBAR_HEIGHT); @@ -224,14 +222,14 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) void wxFrame::DoGetClientSize(int *x, int *y) const { wxTopLevelWindow::DoGetClientSize( x , y ) ; - + #if wxUSE_STATUSBAR if ( GetStatusBar() && GetStatusBar()->IsShown() && y ) { - if ( y) *y -= WX_MAC_STATUSBAR_HEIGHT; + *y -= WX_MAC_STATUSBAR_HEIGHT; } #endif // wxUSE_STATUSBAR - + #if wxUSE_TOOLBAR wxToolBar *toolbar = GetToolBar(); if ( toolbar && toolbar->IsShown() ) @@ -251,18 +249,33 @@ 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 ; int currentwidth , currentheight ; - + GetClientSize( ¤tclientwidth , ¤tclientheight ) ; if ( clientwidth == -1 ) clientwidth = currentclientwidth ; if ( clientheight == -1 ) clientheight = currentclientheight ; GetSize( ¤twidth , ¤theight ) ; - + // find the current client size // Find the difference between the entire window (title bar and all) @@ -302,7 +315,7 @@ void wxFrame::PositionToolBar() { int tx, ty, tw, th; tx = ty = 0 ; - + GetToolBar()->GetSize(& tw, & th); if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) {