check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / mac / carbon / mdi.cpp

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 871d223cb6727883337e250492ece78477554345..58a00ae186b50cad1700e7d0b280d047bab1212a 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -42,20 +42,42 @@ END_EVENT_TABLE()
 
 static const wxChar *TRACE_MDI = _T("mdi");
 
 
 static const wxChar *TRACE_MDI = _T("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_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
 
 // ----------------------------------------------------------------------------
 // Parent frame


@@ -132,6 +154,9 @@ void wxMDIParentFrame::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h
 
 void wxMDIParentFrame::AddChild(wxWindowBase *child)
 {
 
 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);
     if ( !m_currentChild )
     {
         m_currentChild = wxDynamicCast(child, wxMDIChildFrame);


@@ -143,8 +168,6 @@ void wxMDIParentFrame::AddChild(wxWindowBase *child)
             m_shouldBeShown = true;
         }
     }
             m_shouldBeShown = true;
         }
     }

-
-    wxFrame::AddChild(child);

 }
 
 void wxMDIParentFrame::RemoveChild(wxWindowBase *child)
 }
 
 void wxMDIParentFrame::RemoveChild(wxWindowBase *child)


@@ -488,7 +511,7 @@ void wxMDIClientWindow::DoGetClientSize(int *x, int *y) const
 }
 
 // Explicitly call default scroll behaviour
 }
 
 // Explicitly call default scroll behaviour

-void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
+void wxMDIClientWindow::OnScroll(wxScrollEvent& WXUNUSED(event))

 {
 }
 
 {
 }