Applied patch [ 1184295 ] wxDateTimePickerCtrl Create() fix for wxDP_ALLOWNONE

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 7f7bc298af597ead48b23d8ec0733a8cd97fd44c..0723699637324e5a4443b400a0e4a844cbb7551b 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -242,31 +242,31 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
                 event.SetTimestamp(when);
                 event.SetEventObject(focus);
 
-                if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & controlKey )
+                if ( focus && (modifiers ^ wxApp::s_lastModifiers ) & controlKey )
                 {
                     event.m_keyCode = WXK_CONTROL ;
                     event.SetEventType( ( modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }
-                if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & shiftKey )
+                if ( focus && (modifiers ^ wxApp::s_lastModifiers ) & shiftKey )
                 {
                     event.m_keyCode = WXK_SHIFT ;
                     event.SetEventType( ( modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }
-                if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & optionKey )
+                if ( focus && (modifiers ^ wxApp::s_lastModifiers ) & optionKey )
                 {
                     event.m_keyCode = WXK_ALT ;
                     event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }
-                if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & cmdKey )
+                if ( focus && (modifiers ^ wxApp::s_lastModifiers ) & cmdKey )
                 {
                     event.m_keyCode = WXK_COMMAND ;
                     event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }
-                wxTheApp->s_lastModifiers = modifiers ;
+                wxApp::s_lastModifiers = modifiers ;
             }
              break ;
     }
@@ -308,6 +308,10 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
         button = kEventMouseButtonSecondary ;
     }
     
+    // otherwise we report double clicks by connecting a left click with a ctrl-left click
+    if ( clickCount > 1 && button != lastButton )
+        clickCount = 1 ;
+        
     // we must make sure that our synthetic 'right' button corresponds in
     // mouse down, moved and mouse up, and does not deliver a right down and left up
     
@@ -464,9 +468,9 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
     {
         QDGlobalToLocalPoint( UMAGetWindowPort(window ) ,  &windowMouseLocation ) ;
 
-        if ( wxTheApp->s_captureWindow && wxTheApp->s_captureWindow->MacGetTopLevelWindowRef() == (WXWindow) window && windowPart == inContent )
+        if ( wxApp::s_captureWindow && wxApp::s_captureWindow->MacGetTopLevelWindowRef() == (WXWindow) window && windowPart == inContent )
         {
-            currentMouseWindow = wxTheApp->s_captureWindow ;
+            currentMouseWindow = wxApp::s_captureWindow ;
         }
         else if ( (IsWindowActive(window) && windowPart == inContent) )
         {
@@ -601,9 +605,9 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
                 result = noErr ;
             }
         }
-        if ( cEvent.GetKind() == kEventMouseUp && wxTheApp->s_captureWindow )
+        if ( cEvent.GetKind() == kEventMouseUp && wxApp::s_captureWindow )
         {
-            wxTheApp->s_captureWindow = NULL ;
+            wxApp::s_captureWindow = NULL ;
             // update cursor ?
          }
 
@@ -711,6 +715,7 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand
                 event.SetEventObject( toplevelWindow ) ;
 
                 toplevelWindow->GetEventHandler()->ProcessEvent(event) ;
+                toplevelWindow->wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
             }
             if ( attributes & kWindowBoundsChangeOriginChanged )
             {
@@ -751,6 +756,7 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand
                 const Rect adjustedRect = { adjustR.y + top  , adjustR.x + left , adjustR.y + adjustR.height - bottom , adjustR.x + adjustR.width - right } ;
                 if ( !EqualRect( &newRect , &adjustedRect ) )
                     cEvent.SetParameter<Rect>( kEventParamCurrentBounds , &adjustedRect ) ;
+                toplevelWindow->wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
             }
 
             result = noErr ; 
@@ -925,6 +931,9 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent,
     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    
+    if (GetExtraStyle() & wxFRAME_EX_METAL)
+        MacSetMetalAppearance(true);
 
     wxTopLevelWindows.Append(this);
 
@@ -1109,19 +1118,19 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
         }
     }
 
-    if ( HasFlag( wxMINIMIZE_BOX ) )
+    if ( HasFlag( wxMINIMIZE_BOX ) && wclass != kPlainWindowClass )
     {
         attr |= kWindowCollapseBoxAttribute ;
     }
-    if ( HasFlag( wxMAXIMIZE_BOX ) )
+    if ( HasFlag( wxMAXIMIZE_BOX ) && wclass != kPlainWindowClass  )
     {
         attr |= kWindowFullZoomAttribute ;
     }
-    if ( HasFlag( wxRESIZE_BORDER ) )
+    if ( HasFlag( wxRESIZE_BORDER ) && wclass != kPlainWindowClass  )
     {
         attr |= kWindowResizableAttribute ;
     }
-    if ( HasFlag( wxCLOSE_BOX) )
+    if ( HasFlag( wxCLOSE_BOX) && wclass != kPlainWindowClass  )
     {
         attr |= kWindowCloseBoxAttribute ;
     }
@@ -1194,6 +1203,8 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
     MacInstallTopLevelWindowEventHandler() ;
 
+    DoSetWindowVariant( m_windowVariant ) ;
+
     m_macFocus = NULL ;
 
     if ( HasFlag(wxFRAME_SHAPED) )
@@ -1375,8 +1386,10 @@ void wxTopLevelWindowMac::MacGetContentAreaInset( int &left , int &top , int &ri
 
 void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
 {
+    m_cachedClippedRectValid = false ;
     Rect bounds = { y , x , y + height , x + width } ;
     verify_noerr(SetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
+    wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
 }
 
 void wxTopLevelWindowMac::DoGetPosition( int *x, int *y ) const
@@ -1434,6 +1447,58 @@ wxUint32 wxTopLevelWindowMac::MacGetWindowAttributes() const
     return attr ;
 }
 
+void wxTopLevelWindowMac::MacPerformUpdates() 
+{
+#if TARGET_API_MAC_OSX
+       if ( m_macUsesCompositing )
+       {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+           // for composited windows this also triggers a redraw of all
+           // invalid views in the window
+           if( UMAGetSystemVersion() >= 0x1030 )
+               HIWindowFlush((WindowRef) m_macWindow) ;       
+           else                   
+#endif
+           {
+               // the only way to trigger the redrawing on earlier systems is to call
+               // ReceiveNextEvent
+
+               EventRef currentEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+               UInt32 currentEventClass = 0 ;
+               UInt32 currentEventKind = 0 ;
+               if ( currentEvent != NULL )
+               {
+                   currentEventClass = ::GetEventClass( currentEvent ) ;
+                   currentEventKind = ::GetEventKind( currentEvent ) ;
+               }       
+               if ( currentEventClass != kEventClassMenu )
+               {
+                   // when tracking a menu, strange redraw errors occur if we flush now, so leave..
+                   EventRef theEvent;
+                   OSStatus status = noErr ;
+                   status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ;
+               }
+           }
+    }
+    else
+#endif
+    {
+           BeginUpdate( (WindowRef) m_macWindow ) ;
+
+           RgnHandle updateRgn = NewRgn();    
+           if ( updateRgn )
+           {
+               GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn );
+               UpdateControls(  (WindowRef)m_macWindow , updateRgn ) ;
+               // if ( !EmptyRgn( updateRgn ) )
+            // MacDoRedraw( updateRgn , 0 , true) ;
+               DisposeRgn( updateRgn );
+           }
+           EndUpdate( (WindowRef)m_macWindow ) ;
+       QDFlushPortBuffer( GetWindowPort( (WindowRef)m_macWindow ) , NULL ) ;
+    }
+}
+
 // Attracts the users attention to this window if the application is
 // inactive (should be called when a background event occurs)