X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/832f330f225b4909ec9565096528f26a2db332fd..ee864b6db4f26e0cd23711d01082689ddfa022f6:/src/mac/carbon/toplevel.cpp

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 6a5284d6da..27d297fac2 100644
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -130,7 +130,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
     UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
 
 #if wxUSE_UNICODE
-    UInt32 dataSize = 0 ;
+    ByteCount dataSize = 0 ;
     if ( GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, 0 , &dataSize, NULL ) == noErr )
     {
         UniChar buf[2] ;
@@ -248,9 +248,9 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
 
 wxWindow* g_MacLastWindow = NULL ;
 
-static EventMouseButton lastButton = 0 ;
+EventMouseButton g_lastButton = 0 ;
 
-static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
+void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
 {
     UInt32 modifiers = cEvent.GetParameter<UInt32>(kEventParamKeyModifiers, typeUInt32) ;
     Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
@@ -274,19 +274,19 @@ 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 )
+    if ( clickCount > 1 && button != g_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
 
     if ( cEvent.GetKind() == kEventMouseDown )
-        lastButton = button ;
+        g_lastButton = button ;
 
     if ( button == 0 )
-        lastButton = 0 ;
-    else if ( lastButton )
-        button = lastButton ;
+        g_lastButton = 0 ;
+    else if ( g_lastButton )
+        button = g_lastButton ;
 
     // determine the correct down state, wx does not want a 'down' for a mouseUp event,
     // while mac delivers this button
@@ -358,12 +358,14 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
         {
             wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
 
-            // EventMouseWheelAxis axis = cEvent.GetParameter<EventMouseWheelAxis>(kEventParamMouseWheelAxis, typeMouseWheelAxis) ;
-            SInt32 delta = cEvent.GetParameter<SInt32>(kEventParamMouseWheelDelta, typeLongInteger) ;
+            EventMouseWheelAxis axis = cEvent.GetParameter<EventMouseWheelAxis>(kEventParamMouseWheelAxis, typeMouseWheelAxis) ;
+            SInt32 delta = cEvent.GetParameter<SInt32>(kEventParamMouseWheelDelta, typeSInt32) ;
 
             wxevent.m_wheelRotation = delta;
             wxevent.m_wheelDelta = 1;
             wxevent.m_linesPerAction = 1;
+            if ( axis == kEventMouseWheelAxisX )
+                wxevent.m_wheelAxis = 1;
         }
         break ;
 
@@ -467,7 +469,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
 
     if ( window )
     {
-        QDGlobalToLocalPoint( UMAGetWindowPort(window ) ,  &windowMouseLocation ) ;
+        wxMacGlobalToLocal( window,  &windowMouseLocation ) ;
 
         if ( wxApp::s_captureWindow
 #if !NEW_CAPTURE_HANDLING
@@ -929,7 +931,7 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent,
     m_windowId = id == -1 ? NewControlId() : id;
     wxWindow::SetLabel( title ) ;
 
-    MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
+    MacCreateRealWindow( title, pos , size , style , name ) ;
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 
@@ -980,10 +982,18 @@ void wxTopLevelWindowMac::Maximize(bool maximize)
     Point idealSize = { 0 , 0 } ;
     if ( maximize )
     {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+        HIRect bounds ;
+        HIWindowGetAvailablePositioningBounds(kCGNullDirectDisplay,kHICoordSpace72DPIGlobal,
+            &bounds);
+        idealSize.h = bounds.size.width;
+        idealSize.v = bounds.size.height;
+#else
         Rect rect ;
         GetAvailableWindowPositioningBounds(GetMainDevice(),&rect) ;
         idealSize.h = rect.right - rect.left ;
         idealSize.v = rect.bottom - rect.top ;
+#endif
     }
     ZoomWindowIdeal( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , &idealSize ) ;
 }
@@ -1102,6 +1112,20 @@ void  wxTopLevelWindowMac::MacCreateRealWindow(
             wclass = kPlainWindowClass ;
         }
     }
+    else if ( HasFlag( wxPOPUP_WINDOW ) )
+    {
+        // TEMPORARY HACK!
+        // Until we've got a real wxPopupWindow class on wxMac make it a
+        // little easier for wxFrame to be used to emulate it and workaround
+        // the lack of wxPopupWindow.
+        if ( HasFlag( wxBORDER_NONE ) )
+            wclass = kHelpWindowClass ;   // has no border
+        else
+            wclass = kPlainWindowClass ;  // has a single line border, it will have to do for now
+        //attr |= kWindowNoShadowAttribute; // turn off the shadow  Should we??
+        group = GetWindowGroupOfClass(    // float above other windows   
+            kFloatingWindowClass) ;
+    }
     else if ( HasFlag( wxCAPTION ) )
     {
         wclass = kDocumentWindowClass ;
@@ -1148,6 +1172,9 @@ void  wxTopLevelWindowMac::MacCreateRealWindow(
     if ( HasFlag(wxSTAY_ON_TOP) )
         group = GetWindowGroupOfClass(kUtilityWindowClass) ;
 
+    if ( HasFlag( wxFRAME_FLOAT_ON_PARENT ) )
+        group = GetWindowGroupOfClass(kFloatingWindowClass) ;
+        
     attr |= kWindowCompositingAttribute;
 #if 0 // wxMAC_USE_CORE_GRAPHICS ; TODO : decide on overall handling of high dpi screens (pixel vs userscale)
     attr |= kWindowFrameworkScaledAttribute;
@@ -1157,8 +1184,12 @@ void  wxTopLevelWindowMac::MacCreateRealWindow(
     {
         WindowDefSpec customWindowDefSpec;
         customWindowDefSpec.defType = kWindowDefProcPtr;
-        customWindowDefSpec.u.defProc = NewWindowDefUPP(wxShapedMacWindowDef);
-
+        customWindowDefSpec.u.defProc = 
+#ifdef __LP64__
+            (WindowDefUPP) wxShapedMacWindowDef;
+#else
+            NewWindowDefUPP(wxShapedMacWindowDef);
+#endif
         err = ::CreateCustomWindow( &customWindowDefSpec, wclass,
                               attr, &theBoundsRect,
                               (WindowRef*) &m_macWindow);
@@ -1604,7 +1635,7 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
         DisposeRgn(oldRgn);
 
     // Save the region so we can use it later
-    SetWRefCon((WindowRef)MacGetWindowRef(), (SInt32)shapeRegion);
+    SetWRefCon((WindowRef)MacGetWindowRef(), (URefCon)shapeRegion);
 
     // inform the window manager that the window has changed shape
     ReshapeCustomWindow((WindowRef)MacGetWindowRef());
@@ -1620,13 +1651,12 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
 static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect)
 {
     GetWindowPortBounds(window, inRect);
-    Point pt = { inRect->left, inRect->top };
-
-    QDLocalToGlobalPoint( GetWindowPort(window), &pt ) ;
+    Point pt = { inRect->top ,inRect->left };
+    wxMacLocalToGlobal( window, &pt ) ;
+    inRect->bottom += pt.v - inRect->top;
+    inRect->right += pt.h - inRect->left;
     inRect->top = pt.v;
     inRect->left = pt.h;
-    inRect->bottom += pt.v;
-    inRect->right += pt.h;
 }
 
 static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param)