Only test the high order bit from GetKeyState, otherwise we can have

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

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index a5672eebec9de040dd821042e6f51689d5d122ee..542a76cdc786e8daacfd198b16bc24d878efc09d 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -117,6 +117,15 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
     wxFrame::SetMenuBar( menu_bar ) ;
 }
 
+void wxMDIParentFrame::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)
+{
+    if(x)
+        *x = 0;
+    if(y)
+        *y = 0;
+    wxDisplaySize(w,h);
+}
+
 void wxMDIParentFrame::MacActivate(long timestamp, bool activating)
 {
     wxLogDebug(wxT("MDI PARENT=%p MacActivate(0x%08lx,%s)"),this,timestamp,activating?wxT("ACTIV"):wxT("deact"));
@@ -225,7 +234,8 @@ bool wxMDIParentFrame::Show( bool show )
     if ( show )
     {
         // TODO: check for other children
-        Move(-10000, -10000);
+        if(!GetToolBar())
+            Move(-10000, -10000);
     }
 
     if ( !wxFrame::Show(show) )