X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..b97e22c0ca7469762e422960245009648b0e0edf:/src/mac/carbon/mdi.cpp?ds=sidebyside diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp index 8672b2f897..887f726504 100644 --- a/src/mac/carbon/mdi.cpp +++ b/src/mac/carbon/mdi.cpp @@ -19,6 +19,7 @@ extern wxList wxModelessWindows; +#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow) @@ -33,6 +34,7 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow) EVT_SCROLL(wxMDIClientWindow::OnScroll) END_EVENT_TABLE() +#endif // Parent frame @@ -61,7 +63,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent, else m_windowId = (int)NewControlId(); - // TODO: create MDI parent frame + // this window does not exist really wxModelessWindows.Append(this); @@ -75,7 +77,7 @@ wxMDIParentFrame::~wxMDIParentFrame() // Get size *available for subwindows* i.e. excluding menu bar. void wxMDIParentFrame::DoGetClientSize(int *x, int *y) const { - wxFrame::DoGetClientSize( x , y ) ; + wxDisplaySize( x , y ) ; } void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar) @@ -175,7 +177,9 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, if (parent) parent->AddChild(this); - // TODO: create child frame + MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ; + + m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ; wxModelessWindows.Append(this); return FALSE;