EVT_SCROLL(wxMDIClientWindow::OnScroll)
END_EVENT_TABLE()
-static const wxChar *TRACE_MDI = _T("mdi");
+#define TRACE_MDI "mdi"
-static const int IDM_WINDOWTILE = 4001;
static const int IDM_WINDOWTILEHOR = 4001;
static const int IDM_WINDOWCASCADE = 4002;
static const int IDM_WINDOWICONS = 4003;
static const int IDM_WINDOWNEXT = 4004;
static const int IDM_WINDOWTILEVERT = 4005;
-static const int IDM_WINDOWPREV = 4006;
-// This range gives a maximum of 500 MDI children. Should be enough :-)
-static const int wxFIRST_MDI_CHILD = 4100;
-static const int wxLAST_MDI_CHILD = 4600;
+// others
-// Status border dimensions
-static const int wxTHICK_LINE_BORDER = 3;
+void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
+{
+#if 1 // TODO REMOVE
+ if ( inWindowRef )
+ {
+// bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
+// if ( inActivate != isHighlighted )
+#ifndef __LP64__
+ GrafPtr port ;
+ GetPort( &port ) ;
+ SetPortWindowPort( inWindowRef ) ;
+#endif
+ HiliteWindow( inWindowRef , inActivate ) ;
+ ControlRef control = NULL ;
+ ::GetRootControl( inWindowRef , &control ) ;
+ if ( control )
+ {
+ if ( inActivate )
+ ::ActivateControl( control ) ;
+ else
+ ::DeactivateControl( control ) ;
+ }
+#ifndef __LP64__
+ SetPort( port ) ;
+#endif
+ }
+#endif
+}
// ----------------------------------------------------------------------------
// Parent frame
m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));
}
- wxFrame::Create( parent , id , title , pos , size , style , name ) ;
+ if ( !wxFrame::Create( parent , id , title , pos , size , style , name ) )
+ return false;
+
m_parentFrameActive = true;
- OnCreateClient();
+ m_clientWindow = OnCreateClient();
- return true;
+ return m_clientWindow != NULL;
}
wxMDIParentFrame::~wxMDIParentFrame()
void wxMDIParentFrame::AddChild(wxWindowBase *child)
{
+ // moved this to front, so that we don't run into unset m_parent problems later
+ wxFrame::AddChild(child);
+
if ( !m_currentChild )
{
m_currentChild = wxDynamicCast(child, wxMDIChildFrame);
m_shouldBeShown = true;
}
}
-
- wxFrame::AddChild(child);
}
void wxMDIParentFrame::RemoveChild(wxWindowBase *child)
// just return a new class)
wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
{
- m_clientWindow = new wxMDIClientWindow( this );
-
- return m_clientWindow;
+ return new wxMDIClientWindow( this );
}
// Responds to colour changes, and passes event on to children.
if (parent)
parent->AddChild(this);
- MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
+ MacCreateRealWindow( pos , size , MacRemoveBordersFromStyle(style) , name ) ;
+ SetTitle( title );
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
wxModelessWindows.Append(this);
- return false;
+ return true;
}
wxMDIChildFrame::~wxMDIChildFrame()
}
// Explicitly call default scroll behaviour
-void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
+void wxMDIClientWindow::OnScroll(wxScrollEvent& WXUNUSED(event))
{
}