toplevel adaptions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 864e76018520a7cf92325d5bad8bae562e983f3f..1ba90860626f7168f3095d5593c77f736cea0968 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -978,7 +978,7 @@ void wxApp::MacSuspend( bool convertClipboard )
 {
     // we have to deactive the window manually
 
 {
     // we have to deactive the window manually
 

-    wxWindow* window = GetTopWindow() ;
+    wxTopLevelWindow* window = (wxTopLevelWindow*) GetTopWindow() ;

     if ( window )
         window->MacActivate( MacGetCurrentEvent() , false ) ;
 
     if ( window )
         window->MacActivate( MacGetCurrentEvent() , false ) ;
 


@@ -1111,7 +1111,7 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
         ::GetWindowAttributes( frontWindow , &frontWindowAttributes ) ;
 
     short windowPart = ::FindWindow(ev->where, &window);
         ::GetWindowAttributes( frontWindow , &frontWindowAttributes ) ;
 
     short windowPart = ::FindWindow(ev->where, &window);

-    wxWindow* win = wxFindWinFromMacWindow( window ) ;
+    wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;

     if ( wxPendingDelete.Member(win) )
         return ;
 
     if ( wxPendingDelete.Member(win) )
         return ;
 


@@ -1274,7 +1274,7 @@ void wxApp::MacHandleMouseUpEvent( EventRecord *ev )
             break ;
         default:
             {
             break ;
         default:
             {

-                wxWindow* win = wxFindWinFromMacWindow( window ) ;
+                wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;

                 if ( win )
                     win->MacMouseUp( ev , windowPart ) ;
             }
                 if ( win )
                     win->MacMouseUp( ev , windowPart ) ;
             }


@@ -1556,7 +1556,7 @@ void wxApp::MacHandleActivateEvent( EventRecord *ev )
             // if it is a floater we activate/deactivate the front non-floating window instead
             window = ::FrontNonFloatingWindow() ;
         }
             // if it is a floater we activate/deactivate the front non-floating window instead
             window = ::FrontNonFloatingWindow() ;
         }

-        wxWindow* win = wxFindWinFromMacWindow( window ) ;
+        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;

         if ( win )
             win->MacActivate( ev , activate ) ;
     }
         if ( win )
             win->MacActivate( ev , activate ) ;
     }


@@ -1565,11 +1565,11 @@ void wxApp::MacHandleActivateEvent( EventRecord *ev )
 void wxApp::MacHandleUpdateEvent( EventRecord *ev )
 {
     WindowRef window = (WindowRef) ev->message ;
 void wxApp::MacHandleUpdateEvent( EventRecord *ev )
 {
     WindowRef window = (WindowRef) ev->message ;

-    wxWindow * win = wxFindWinFromMacWindow( window ) ;
+    wxTopLevelWindowMac * win = wxFindWinFromMacWindow( window ) ;

     if ( win )
     {
         if ( !wxPendingDelete.Member(win) )
     if ( win )
     {
         if ( !wxPendingDelete.Member(win) )

-            win->MacUpdate( ev ) ;
+            win->MacUpdate( ev->when ) ;

     }
     else
     {
     }
     else
     {


@@ -1626,13 +1626,13 @@ void wxApp::MacHandleOSEvent( EventRecord *ev )
 
                     if ( oldFrontWindow )
                     {
 
                     if ( oldFrontWindow )
                     {

-                        wxWindow* win = wxFindWinFromMacWindow( oldFrontWindow ) ;
+                        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( oldFrontWindow ) ;

                         if ( win )
                             win->MacActivate( ev , false ) ;
                     }
                     if ( newFrontWindow )
                     {
                         if ( win )
                             win->MacActivate( ev , false ) ;
                     }
                     if ( newFrontWindow )
                     {

-                        wxWindow* win = wxFindWinFromMacWindow( newFrontWindow ) ;
+                        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( newFrontWindow ) ;

                         if ( win )
                             win->MacActivate( ev , true ) ;
                     }
                         if ( win )
                             win->MacActivate( ev , true ) ;
                     }


@@ -1726,7 +1726,7 @@ void wxApp::MacHandleOSEvent( EventRecord *ev )
                             ::GetNextEvent(0, &tmp);
                             ev->modifiers = tmp.modifiers;
                             
                             ::GetNextEvent(0, &tmp);
                             ev->modifiers = tmp.modifiers;
                             

-                            wxWindow* win = wxFindWinFromMacWindow( window ) ;
+                            wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;

                             if ( win )
                                 win->MacMouseMoved( ev , windowPart ) ;
                             else
                             if ( win )
                                 win->MacMouseMoved( ev , windowPart ) ;
                             else

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 864e76018520a7cf92325d5bad8bae562e983f3f..1ba90860626f7168f3095d5593c77f736cea0968 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -978,7 +978,7 @@ void wxApp::MacSuspend( bool convertClipboard )
 {
     // we have to deactive the window manually
 
 {
     // we have to deactive the window manually
 

-    wxWindow* window = GetTopWindow() ;
+    wxTopLevelWindow* window = (wxTopLevelWindow*) GetTopWindow() ;

     if ( window )
         window->MacActivate( MacGetCurrentEvent() , false ) ;
 
     if ( window )
         window->MacActivate( MacGetCurrentEvent() , false ) ;
 


@@ -1111,7 +1111,7 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
         ::GetWindowAttributes( frontWindow , &frontWindowAttributes ) ;
 
     short windowPart = ::FindWindow(ev->where, &window);
         ::GetWindowAttributes( frontWindow , &frontWindowAttributes ) ;
 
     short windowPart = ::FindWindow(ev->where, &window);

-    wxWindow* win = wxFindWinFromMacWindow( window ) ;
+    wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;

     if ( wxPendingDelete.Member(win) )
         return ;
 
     if ( wxPendingDelete.Member(win) )
         return ;
 


@@ -1274,7 +1274,7 @@ void wxApp::MacHandleMouseUpEvent( EventRecord *ev )
             break ;
         default:
             {
             break ;
         default:
             {

-                wxWindow* win = wxFindWinFromMacWindow( window ) ;
+                wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;

                 if ( win )
                     win->MacMouseUp( ev , windowPart ) ;
             }
                 if ( win )
                     win->MacMouseUp( ev , windowPart ) ;
             }


@@ -1556,7 +1556,7 @@ void wxApp::MacHandleActivateEvent( EventRecord *ev )
             // if it is a floater we activate/deactivate the front non-floating window instead
             window = ::FrontNonFloatingWindow() ;
         }
             // if it is a floater we activate/deactivate the front non-floating window instead
             window = ::FrontNonFloatingWindow() ;
         }

-        wxWindow* win = wxFindWinFromMacWindow( window ) ;
+        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;

         if ( win )
             win->MacActivate( ev , activate ) ;
     }
         if ( win )
             win->MacActivate( ev , activate ) ;
     }


@@ -1565,11 +1565,11 @@ void wxApp::MacHandleActivateEvent( EventRecord *ev )
 void wxApp::MacHandleUpdateEvent( EventRecord *ev )
 {
     WindowRef window = (WindowRef) ev->message ;
 void wxApp::MacHandleUpdateEvent( EventRecord *ev )
 {
     WindowRef window = (WindowRef) ev->message ;

-    wxWindow * win = wxFindWinFromMacWindow( window ) ;
+    wxTopLevelWindowMac * win = wxFindWinFromMacWindow( window ) ;

     if ( win )
     {
         if ( !wxPendingDelete.Member(win) )
     if ( win )
     {
         if ( !wxPendingDelete.Member(win) )

-            win->MacUpdate( ev ) ;
+            win->MacUpdate( ev->when ) ;

     }
     else
     {
     }
     else
     {


@@ -1626,13 +1626,13 @@ void wxApp::MacHandleOSEvent( EventRecord *ev )
 
                     if ( oldFrontWindow )
                     {
 
                     if ( oldFrontWindow )
                     {

-                        wxWindow* win = wxFindWinFromMacWindow( oldFrontWindow ) ;
+                        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( oldFrontWindow ) ;

                         if ( win )
                             win->MacActivate( ev , false ) ;
                     }
                     if ( newFrontWindow )
                     {
                         if ( win )
                             win->MacActivate( ev , false ) ;
                     }
                     if ( newFrontWindow )
                     {

-                        wxWindow* win = wxFindWinFromMacWindow( newFrontWindow ) ;
+                        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( newFrontWindow ) ;

                         if ( win )
                             win->MacActivate( ev , true ) ;
                     }
                         if ( win )
                             win->MacActivate( ev , true ) ;
                     }


@@ -1726,7 +1726,7 @@ void wxApp::MacHandleOSEvent( EventRecord *ev )
                             ::GetNextEvent(0, &tmp);
                             ev->modifiers = tmp.modifiers;
                             
                             ::GetNextEvent(0, &tmp);
                             ev->modifiers = tmp.modifiers;
                             

-                            wxWindow* win = wxFindWinFromMacWindow( window ) ;
+                            wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;

                             if ( win )
                                 win->MacMouseMoved( ev , windowPart ) ;
                             else
                             if ( win )
                                 win->MacMouseMoved( ev , windowPart ) ;
                             else