#pragma hdrstop
#endif
+#include "wx/toplevel.h"
+
#ifndef WX_PRECOMP
#include "wx/app.h"
- #include "wx/toplevel.h"
#include "wx/frame.h"
#include "wx/string.h"
#include "wx/log.h"
#include "wx/mac/uma.h"
#include "wx/mac/aga.h"
-#include "wx/app.h"
#include "wx/tooltip.h"
#include "wx/dnd.h"
// Carbon Events
// ---------------------------------------------------------------------------
-extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
-
static const EventTypeSpec eventList[] =
{
// TODO: remove control related event like key and mouse (except for WindowLeave events)
-#if 1
- { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
{ kEventClassKeyboard, kEventRawKeyDown } ,
{ kEventClassKeyboard, kEventRawKeyRepeat } ,
{ kEventClassKeyboard, kEventRawKeyUp } ,
{ kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
-#endif
+
+ { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
+ { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } ,
{ kEventClassWindow , kEventWindowShown } ,
{ kEventClassWindow , kEventWindowActivated } ,
{ kEventClassMouse , kEventMouseDragged } ,
} ;
-static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
-{
- OSStatus result = eventNotHandledErr ;
- wxWindow* focus ;
- UInt32 keyCode, modifiers ;
- Point point ;
- EventRef rawEvent ;
- unsigned char charCode ;
-
- GetEventParameter( event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, sizeof(rawEvent), NULL, &rawEvent ) ;
-
- GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
- GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
- GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
- GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point );
-
- focus = wxWindow::FindFocus() ;
-
- switch ( GetEventKind( event ) )
- {
- case kEventTextInputUnicodeForKeyEvent :
- {
- // this is only called when no default handler has jumped in, e.g. a wxControl on a floater window does not
- // get its own kEventTextInputUnicodeForKeyEvent, so we reroute the event back to the control
- wxControl* control = wxDynamicCast( focus , wxControl ) ;
- if ( control )
- {
- ControlRef macControl = (ControlRef) control->GetHandle() ;
- if ( macControl )
- {
- ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ;
- result = noErr ;
- }
- }
-
-#if 0
- // this may lead to double events sent to a window in case all handlers have skipped the key down event
- UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
- UInt32 message = (keyCode << 8) + charCode;
-
- if ( (focus != NULL) &&
- wxTheApp->MacSendKeyDownEvent( focus , message , modifiers , when , point.h , point.v ) )
- {
- result = noErr ;
- }
-#endif
- }
- break ;
-
- default:
- break ;
- }
-
- return result ;
-}
-
static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
OSStatus result = eventNotHandledErr ;
focus = (wxTopLevelWindowMac*) data ;
unsigned char charCode ;
- wxChar uniChar = 0 ;
+ wxChar uniChar[2] ;
+ uniChar[0] = 0;
+ uniChar[1] = 0;
+
UInt32 keyCode ;
UInt32 modifiers ;
Point point ;
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] ;
+ int numChars = dataSize / sizeof( UniChar) + 1;
UniChar* charBuf = buf ;
- if ( dataSize > 4 )
- charBuf = new UniChar[ dataSize / sizeof( UniChar) ] ;
+ if ( numChars * 2 > 4 )
+ charBuf = new UniChar[ numChars ] ;
GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;
+ charBuf[ numChars - 1 ] = 0;
#if SIZEOF_WCHAR_T == 2
uniChar = charBuf[0] ;
#else
wxMBConvUTF16 converter ;
- converter.MB2WC( &uniChar , (const char*)charBuf , 1 ) ;
+ converter.MB2WC( uniChar , (const char*)charBuf , 2 ) ;
#endif
- if ( dataSize > 4 )
+ if ( numChars * 2 > 4 )
delete[] charBuf ;
}
#endif
WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
wxTheApp->MacSetCurrentEvent( event , handler ) ;
if ( /* focus && */ wxTheApp->MacSendKeyDownEvent(
- focus , message , modifiers , when , point.h , point.v , uniChar ) )
+ focus , message , modifiers , when , point.h , point.v , uniChar[0] ) )
{
result = noErr ;
}
case kEventRawKeyUp :
if ( /* focus && */ wxTheApp->MacSendKeyUpEvent(
- focus , message , modifiers , when , point.h , point.v , uniChar ) )
+ focus , message , modifiers , when , point.h , point.v , uniChar[0] ) )
{
result = noErr ;
}
event.m_y = point.v;
#if wxUSE_UNICODE
- event.m_uniChar = uniChar ;
+ event.m_uniChar = uniChar[0] ;
#endif
event.SetTimestamp(when);
wxWindow* g_MacLastWindow = NULL ;
-static EventMouseButton lastButton = 0 ;
+EventMouseButton g_lastButton = 0 ;
+bool g_lastButtonWasFakeRight = false ;
-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) ;
wxevent.m_metaDown = modifiers & cmdKey;
wxevent.SetTimestamp( cEvent.GetTicks() ) ;
- // a control click is interpreted as a right click
+ // a control click is interpreted as a right click
+ bool thisButtonIsFakeRight = false ;
if ( button == kEventMouseButtonPrimary && (modifiers & controlKey) )
+ {
button = kEventMouseButtonSecondary ;
-
+ thisButtonIsFakeRight = true ;
+ }
// 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 ;
+ g_lastButtonWasFakeRight = thisButtonIsFakeRight ;
+ }
if ( button == 0 )
- lastButton = 0 ;
- else if ( lastButton )
- button = lastButton ;
+ {
+ g_lastButton = 0 ;
+ g_lastButtonWasFakeRight = false ;
+ }
+ else if ( g_lastButton == kEventMouseButtonSecondary && g_lastButtonWasFakeRight )
+ button = g_lastButton ;
// determine the correct down state, wx does not want a 'down' for a mouseUp event,
// while mac delivers this button
{
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 ;
{
Point testLocation = location ;
- if ( toplevelWindow && toplevelWindow->MacUsesCompositing() )
+ if ( toplevelWindow )
{
testLocation.h -= r.left ;
testLocation.v -= r.top ;
ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow , const Point& location , WindowRef window , ControlPartCode *outPart )
{
#if TARGET_API_MAC_OSX
- if ( UMAGetSystemVersion() >= 0x1030 && ( toplevelWindow == 0 || toplevelWindow->MacUsesCompositing() ) )
+ if ( UMAGetSystemVersion() >= 0x1030 )
return FindControlUnderMouse( location , window , outPart ) ;
#endif
Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
Point windowMouseLocation = screenMouseLocation ;
- WindowRef window ;
+ WindowRef window = NULL;
short windowPart = ::FindWindow(screenMouseLocation, &window);
wxWindow* currentMouseWindow = NULL ;
if ( window )
{
- QDGlobalToLocalPoint( UMAGetWindowPort(window ) , &windowMouseLocation ) ;
+ wxMacGlobalToLocal( window, &windowMouseLocation ) ;
if ( wxApp::s_captureWindow
#if !NEW_CAPTURE_HANDLING
#endif
}
}
+
+ // disabled windows must not get any input messages
+ if ( currentMouseWindow && !currentMouseWindow->MacIsReallyEnabled() )
+ currentMouseWindow = NULL;
}
}
// make tooltips current
#if wxUSE_TOOLTIPS
- if ( wxevent.GetEventType() == wxEVT_MOTION
- || wxevent.GetEventType() == wxEVT_ENTER_WINDOW
- || wxevent.GetEventType() == wxEVT_LEAVE_WINDOW )
+ if ( wxevent.GetEventType() == wxEVT_MOTION )
wxToolTip::RelayEvent( currentMouseWindow , wxevent );
#endif
if ( wxevent.GetEventType() == wxEVT_LEFT_DOWN )
{
// ... that is set focus to this window
- if (currentMouseWindow->AcceptsFocus() && wxWindow::FindFocus()!=currentMouseWindow)
+ if (currentMouseWindow->CanAcceptFocus() && wxWindow::FindFocus()!=currentMouseWindow)
currentMouseWindow->SetFocus();
}
EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
Point clickLocation = windowMouseLocation ;
- if ( toplevelWindow->MacUsesCompositing() )
- currentMouseWindow->MacRootWindowToWindow( &clickLocation.h , &clickLocation.v ) ;
+ currentMouseWindow->MacRootWindowToWindow( &clickLocation.h , &clickLocation.v ) ;
HandleControlClick( (ControlRef) currentMouseWindow->GetHandle() , clickLocation ,
modifiers , (ControlActionUPP ) -1 ) ;
cursorPoint += cursorTarget->GetPosition();
}
- } // else if ( currentMouseWindow )
- else
+ }
+ else // currentMouseWindow == NULL
{
// don't mess with controls we don't know about
// for some reason returning eventNotHandledErr does not lead to the correct behaviour
{
EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
Point clickLocation = windowMouseLocation ;
- if ( toplevelWindow->MacUsesCompositing() )
- {
-#ifdef __WXMAC_OSX__
- HIPoint hiPoint ;
- hiPoint.x = clickLocation.h ;
- hiPoint.y = clickLocation.v ;
- HIViewConvertPoint( &hiPoint , (ControlRef) toplevelWindow->GetHandle() , control ) ;
- clickLocation.h = (int)hiPoint.x ;
- clickLocation.v = (int)hiPoint.y ;
-#endif
- }
+#if TARGET_API_MAC_OSX
+ HIPoint hiPoint ;
+ hiPoint.x = clickLocation.h ;
+ hiPoint.y = clickLocation.v ;
+ HIViewConvertPoint( &hiPoint , (ControlRef) toplevelWindow->GetHandle() , control ) ;
+ clickLocation.h = (int)hiPoint.x ;
+ clickLocation.v = (int)hiPoint.y ;
+#endif // TARGET_API_MAC_OSX
HandleControlClick( control , clickLocation , modifiers , (ControlActionUPP ) -1 ) ;
result = noErr ;
wxFrame *frame = wxDynamicCast( toplevelWindow , wxFrame ) ;
if ( frame )
{
-#if wxUSE_STATUSBAR
- frame->PositionStatusBar();
-#endif
-#if wxUSE_TOOLBAR
- frame->PositionToolBar();
-#endif
+ frame->PositionBars();
}
wxSizeEvent event( r.GetSize() , toplevelWindow->GetId() ) ;
return result ;
}
+// mix this in from window.cpp
+pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ;
+
pascal OSStatus wxMacTopLevelEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
OSStatus result = eventNotHandledErr ;
switch ( GetEventClass( event ) )
{
- case kEventClassKeyboard :
- result = KeyboardEventHandler( handler, event , data ) ;
+ case kEventClassTextInput :
+ result = wxMacUnicodeTextEventHandler( handler, event , data ) ;
break ;
- case kEventClassTextInput :
- result = TextInputEventHandler( handler, event , data ) ;
+ case kEventClassKeyboard :
+ result = KeyboardEventHandler( handler, event , data ) ;
break ;
case kEventClassWindow :
wxPoint m_position ;
wxSize m_size ;
bool m_wasResizable ;
-}
-FullScreenData ;
+} FullScreenData ;
void wxTopLevelWindowMac::Init()
{
m_maximizeOnShow = false;
m_macWindow = NULL ;
-#if TARGET_API_MAC_OSX
- m_macUsesCompositing = ( UMAGetSystemVersion() >= 0x1030 );
-#else
- m_macUsesCompositing = false;
-#endif
-
m_macEventHandler = NULL ;
m_macFullScreenData = NULL ;
}
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));
FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
delete data ;
m_macFullScreenData = NULL ;
+
+ // avoid dangling refs
+ if ( s_macDeactivateWindow == this )
+ s_macDeactivateWindow = NULL;
}
void wxTopLevelWindowMac::Maximize(bool maximize)
{
- // TODO: check if this is still necessary
-#if 0
- wxMacPortStateHelper help( (GrafPtr)GetWindowPort( (WindowRef)m_macWindow) ) ;
- wxMacWindowClipper clip( this );
-#endif
-
- if ( !IsWindowInStandardState( (WindowRef)m_macWindow, NULL, NULL ) )
+ Point idealSize = { 0 , 0 } ;
+ if ( maximize )
{
- Rect rect;
-
- GetWindowBounds((WindowRef)m_macWindow, kWindowGlobalPortRgn, &rect);
- SetWindowIdealUserState((WindowRef)m_macWindow, &rect);
- SetWindowUserState((WindowRef)m_macWindow, &rect);
+#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
}
-
- ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ;
+ ZoomWindowIdeal( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , &idealSize ) ;
}
bool wxTopLevelWindowMac::IsMaximized() const
return wxPoint(0, 0) ;
}
-void wxTopLevelWindowMac::SetIcon(const wxIcon& icon)
-{
- // this sets m_icon
- wxTopLevelWindowBase::SetIcon(icon);
-}
-
void wxTopLevelWindowMac::MacSetBackgroundBrush( const wxBrush &brush )
{
wxTopLevelWindowBase::MacSetBackgroundBrush( brush ) ;
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 ;
else if ( HasFlag( wxFRAME_DRAWER ) )
{
wclass = kDrawerWindowClass;
- // we must force compositing on a drawer
- m_macUsesCompositing = true ;
}
#endif //10.2 and up
else
if ( HasFlag(wxSTAY_ON_TOP) )
group = GetWindowGroupOfClass(kUtilityWindowClass) ;
-#if TARGET_API_MAC_OSX
- if ( m_macUsesCompositing )
- attr |= kWindowCompositingAttribute;
+ 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;
#endif
if ( HasFlag(wxFRAME_SHAPED) )
{
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);
wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") );
+ // setup a separate group for each window, so that overlays can be handled easily
+ verify_noerr( CreateWindowGroup( kWindowGroupAttrMoveTogether | kWindowGroupAttrLayerTogether | kWindowGroupAttrHideOnCollapse, &group ));
+ verify_noerr( SetWindowGroupParent( group, GetWindowGroup( (WindowRef) m_macWindow )));
+ verify_noerr( SetWindowGroup( (WindowRef) m_macWindow , group ));
+
// the create commands are only for content rect,
// so we have to set the size again as structure bounds
SetWindowBounds( (WindowRef) m_macWindow , kWindowStructureRgn , &theBoundsRect ) ;
UMASetWTitle( (WindowRef) m_macWindow , title , m_font.GetEncoding() ) ;
m_peer = new wxMacControl(this , true /*isRootControl*/) ;
-#if TARGET_API_MAC_OSX
- if ( m_macUsesCompositing )
- {
- // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of
- // the content view, so we have to retrieve it explicitly
- HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID ,
- m_peer->GetControlRefAddr() ) ;
- if ( !m_peer->Ok() )
- {
- // compatibility mode fallback
- GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ;
- }
- }
-#endif
+ // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of
+ // the content view, so we have to retrieve it explicitly
+ HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID ,
+ m_peer->GetControlRefAddr() ) ;
+ if ( !m_peer->Ok() )
{
- ::CreateRootControl( (WindowRef)m_macWindow , m_peer->GetControlRefAddr() ) ;
+ // compatibility mode fallback
+ GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ;
}
// the root control level handler
MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ;
-#if TARGET_API_MAC_OSX
+ // Causes the inner part of the window not to be metal
+ // if the style is used before window creation.
+#if 0 // TARGET_API_MAC_OSX
if ( m_macUsesCompositing && m_macWindow != NULL )
{
if ( GetExtraStyle() & wxFRAME_EX_METAL )
return m_macFullScreenData != NULL ;
}
-void wxTopLevelWindowMac::SetExtraStyle(long exStyle)
+
+bool wxTopLevelWindowMac::SetTransparent(wxByte alpha)
+{
+ OSStatus result = SetWindowAlpha((WindowRef)m_macWindow, float(alpha)/255.0);
+ return result == noErr;
+}
+
+
+bool wxTopLevelWindowMac::CanSetTransparent()
+{
+ return true;
+}
+
+
+void wxTopLevelWindowMac::SetExtraStyle(long exStyle)
{
if ( GetExtraStyle() == exStyle )
return ;
-
+
wxTopLevelWindowBase::SetExtraStyle( exStyle ) ;
#if TARGET_API_MAC_OSX
- if ( m_macUsesCompositing && m_macWindow != NULL )
+ if ( m_macWindow != NULL )
{
bool metal = GetExtraStyle() & wxFRAME_EX_METAL ;
if ( MacGetMetalAppearance() != metal )
#endif
}
+// TODO: switch to structure bounds -
// we are still using coordinates of the content view
-// TODO: switch to structure bounds
//
void wxTopLevelWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
{
void wxTopLevelWindowMac::MacSetMetalAppearance( bool set )
{
#if TARGET_API_MAC_OSX
- wxASSERT_MSG( m_macUsesCompositing ,
- wxT("Cannot set metal appearance on a non-compositing window") ) ;
-
MacChangeWindowAttributes( set ? kWindowMetalAttribute : kWindowNoAttributes ,
set ? kWindowNoAttributes : kWindowMetalAttribute ) ;
#endif
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 ) ;
- }
- }
- }
+ // for composited windows this also triggers a redraw of all
+ // invalid views in the window
+ if ( UMAGetSystemVersion() >= 0x1030 )
+ HIWindowFlush((WindowRef) m_macWindow) ;
else
#endif
{
- BeginUpdate( (WindowRef) m_macWindow ) ;
+ // the only way to trigger the redrawing on earlier systems is to call
+ // ReceiveNextEvent
- RgnHandle updateRgn = NewRgn();
- if ( updateRgn )
+ EventRef currentEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+ UInt32 currentEventClass = 0 ;
+ if ( currentEvent != NULL )
{
- GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn );
- UpdateControls( (WindowRef)m_macWindow , updateRgn ) ;
-
- // if ( !EmptyRgn( updateRgn ) )
- // MacDoRedraw( updateRgn , 0 , true) ;
-
- DisposeRgn( updateRgn );
+ currentEventClass = ::GetEventClass( currentEvent ) ;
+ ::GetEventKind( currentEvent ) ;
}
- EndUpdate( (WindowRef)m_macWindow ) ;
- QDFlushPortBuffer( GetWindowPort( (WindowRef)m_macWindow ) , NULL ) ;
+ if ( currentEventClass != kEventClassMenu )
+ {
+ // when tracking a menu, strange redraw errors occur if we flush now, so leave..
+ EventRef theEvent;
+ ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ;
+ }
}
}
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());
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)
return 0;
}
-
projects / wxWidgets.git / blobdiff