Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reformat for readability

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2005-12-13 00:59:19 +00:00
parent 761598d4e5
commit 52c3df9930
1 changed files with 227 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

250
src/mac/carbon/toplevel.cpp
View File

@@ -128,8 +128,7 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode ); GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode );
GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers ); GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point );
sizeof( Point ), NULL, &point );
switch ( GetEventKind( event ) ) switch ( GetEventKind( event ) )
{ {
@@ -146,7 +145,8 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
result = noErr ; result = noErr ;
} }
} }
/*
#if 0
// this may lead to double events sent to a window in case all handlers have skipped the key down event // 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 when = EventTimeToTicks( GetEventTime( event ) ) ;
UInt32 message = (keyCode << 8) + charCode; UInt32 message = (keyCode << 8) + charCode;
@@ -156,7 +156,10 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
{ {
result = noErr ; result = noErr ;
} }
*/ #endif
break ;
default:
break ; break ;
} }
@@ -204,8 +207,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode ); GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode );
GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers ); GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point );
sizeof( Point ), NULL, &point );
UInt32 message = (keyCode << 8) + charCode; UInt32 message = (keyCode << 8) + charCode;
switch( GetEventKind( event ) ) switch( GetEventKind( event ) )
@@ -224,6 +226,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ; wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;
} }
break ; break ;
case kEventRawKeyUp : case kEventRawKeyUp :
if ( /* focus && */ wxTheApp->MacSendKeyUpEvent( if ( /* focus && */ wxTheApp->MacSendKeyUpEvent(
focus , message , modifiers , when , point.h , point.v , uniChar ) ) focus , message , modifiers , when , point.h , point.v , uniChar ) )
@@ -231,6 +234,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
result = noErr ; result = noErr ;
} }
break ; break ;
case kEventRawKeyModifiersChanged : case kEventRawKeyModifiersChanged :
{ {
wxKeyEvent event(wxEVT_KEY_DOWN); wxKeyEvent event(wxEVT_KEY_DOWN);
@@ -274,6 +278,9 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
wxApp::s_lastModifiers = modifiers ; wxApp::s_lastModifiers = modifiers ;
} }
break ; break ;
default:
break;
} }
return result ; return result ;
@@ -282,7 +289,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
// we don't interfere with foreign controls on our toplevel windows, therefore we always give back eventNotHandledErr // we don't interfere with foreign controls on our toplevel windows, therefore we always give back eventNotHandledErr
// for windows that we didn't create (like eg Scrollbars in a databrowser), or for controls where we did not handle the // for windows that we didn't create (like eg Scrollbars in a databrowser), or for controls where we did not handle the
// mouse down at all // mouse down at all
//
// This handler can also be called from app level where data (ie target window) may be null or a non wx window // This handler can also be called from app level where data (ie target window) may be null or a non wx window
wxWindow* g_MacLastWindow = NULL ; wxWindow* g_MacLastWindow = NULL ;
@@ -307,11 +314,10 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
wxevent.m_altDown = modifiers & optionKey; wxevent.m_altDown = modifiers & optionKey;
wxevent.m_metaDown = modifiers & cmdKey; wxevent.m_metaDown = modifiers & cmdKey;
wxevent.SetTimestamp( cEvent.GetTicks() ) ; wxevent.SetTimestamp( cEvent.GetTicks() ) ;
// a control click is interpreted as a right click // a control click is interpreted as a right click
if ( button == kEventMouseButtonPrimary && (modifiers & controlKey) ) if ( button == kEventMouseButtonPrimary && (modifiers & controlKey) )
{
button = kEventMouseButtonSecondary ; button = kEventMouseButtonSecondary ;
}
// otherwise we report double clicks by connecting a left click with a ctrl-left click // otherwise we report double clicks by connecting a left click with a ctrl-left click
if ( clickCount > 1 && button != lastButton ) if ( clickCount > 1 && button != lastButton )
@@ -337,14 +343,20 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
case kEventMouseButtonPrimary : case kEventMouseButtonPrimary :
wxevent.m_leftDown = true ; wxevent.m_leftDown = true ;
break ; break ;
case kEventMouseButtonSecondary : case kEventMouseButtonSecondary :
wxevent.m_rightDown = true ; wxevent.m_rightDown = true ;
break ; break ;
case kEventMouseButtonTertiary : case kEventMouseButtonTertiary :
wxevent.m_middleDown = true ; wxevent.m_middleDown = true ;
break ; break ;
default:
break ;
} }
} }
// translate into wx types // translate into wx types
switch ( cEvent.GetKind() ) switch ( cEvent.GetKind() )
{ {
@@ -354,28 +366,40 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
case kEventMouseButtonPrimary : case kEventMouseButtonPrimary :
wxevent.SetEventType(clickCount > 1 ? wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN ) ; wxevent.SetEventType(clickCount > 1 ? wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN ) ;
break ; break ;
case kEventMouseButtonSecondary : case kEventMouseButtonSecondary :
wxevent.SetEventType( clickCount > 1 ? wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN ) ; wxevent.SetEventType( clickCount > 1 ? wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN ) ;
break ; break ;
case kEventMouseButtonTertiary : case kEventMouseButtonTertiary :
wxevent.SetEventType(clickCount > 1 ? wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN ) ; wxevent.SetEventType(clickCount > 1 ? wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN ) ;
break ; break ;
default:
break ;
} }
break ; break ;
case kEventMouseUp : case kEventMouseUp :
switch ( button ) switch ( button )
{ {
case kEventMouseButtonPrimary : case kEventMouseButtonPrimary :
wxevent.SetEventType( wxEVT_LEFT_UP ) ; wxevent.SetEventType( wxEVT_LEFT_UP ) ;
break ; break ;
case kEventMouseButtonSecondary : case kEventMouseButtonSecondary :
wxevent.SetEventType( wxEVT_RIGHT_UP ) ; wxevent.SetEventType( wxEVT_RIGHT_UP ) ;
break ; break ;
case kEventMouseButtonTertiary : case kEventMouseButtonTertiary :
wxevent.SetEventType( wxEVT_MIDDLE_UP ) ; wxevent.SetEventType( wxEVT_MIDDLE_UP ) ;
break ; break ;
default:
break ;
} }
break ; break ;
case kEventMouseWheelMoved : case kEventMouseWheelMoved :
{ {
wxevent.SetEventType(wxEVT_MOUSEWHEEL ) ; wxevent.SetEventType(wxEVT_MOUSEWHEEL ) ;
@@ -386,8 +410,9 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
wxevent.m_wheelRotation = delta; wxevent.m_wheelRotation = delta;
wxevent.m_wheelDelta = 1; wxevent.m_wheelDelta = 1;
wxevent.m_linesPerAction = 1; wxevent.m_linesPerAction = 1;
break ;
} }
break ;
default : default :
wxevent.SetEventType(wxEVT_MOTION ) ; wxevent.SetEventType(wxEVT_MOTION ) ;
break ; break ;
@@ -438,6 +463,7 @@ ControlRef wxMacFindSubControl( wxTopLevelWindowMac* toplevelWindow, const Point
} }
} }
} }
return NULL ; return NULL ;
} }
@@ -537,6 +563,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
g_MacLastWindow->GetEventHandler()->ProcessEvent(eventleave); g_MacLastWindow->GetEventHandler()->ProcessEvent(eventleave);
} }
if ( currentMouseWindow ) if ( currentMouseWindow )
{ {
wxMouseEvent evententer(wxevent); wxMouseEvent evententer(wxevent);
@@ -549,6 +576,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
currentMouseWindow->GetEventHandler()->ProcessEvent(evententer); currentMouseWindow->GetEventHandler()->ProcessEvent(evententer);
} }
g_MacLastWindow = currentMouseWindow ; g_MacLastWindow = currentMouseWindow ;
} }
@@ -560,7 +588,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
::MenuSelect( screenMouseLocation ) ; ::MenuSelect( screenMouseLocation ) ;
result = noErr ; result = noErr ;
} }
} // if ( windowPart == inMenuBar ) }
else if ( currentMouseWindow ) else if ( currentMouseWindow )
{ {
wxWindow *currentMouseWindowParent = currentMouseWindow->GetParent(); wxWindow *currentMouseWindowParent = currentMouseWindow->GetParent();
@@ -627,6 +655,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
result = noErr ; result = noErr ;
} }
} }
if ( cEvent.GetKind() == kEventMouseUp && wxApp::s_captureWindow ) if ( cEvent.GetKind() == kEventMouseUp && wxApp::s_captureWindow )
{ {
wxApp::s_captureWindow = NULL ; wxApp::s_captureWindow = NULL ;
@@ -666,8 +695,8 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
clickLocation.v = (int)hiPoint.y ; clickLocation.v = (int)hiPoint.y ;
#endif #endif
} }
HandleControlClick( control , clickLocation ,
modifiers , (ControlActionUPP ) -1 ) ; HandleControlClick( control , clickLocation , modifiers , (ControlActionUPP ) -1 ) ;
result = noErr ; result = noErr ;
} }
} }
@@ -693,8 +722,9 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand
wxevent.SetEventObject(toplevelWindow); wxevent.SetEventObject(toplevelWindow);
toplevelWindow->GetEventHandler()->ProcessEvent(wxevent); toplevelWindow->GetEventHandler()->ProcessEvent(wxevent);
// we still sending an eventNotHandledErr in order to allow for default processing // we still sending an eventNotHandledErr in order to allow for default processing
break ;
} }
break ;
case kEventWindowDeactivated : case kEventWindowDeactivated :
{ {
toplevelWindow->MacActivate(cEvent.GetTicks() , false) ; toplevelWindow->MacActivate(cEvent.GetTicks() , false) ;
@@ -703,18 +733,19 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand
wxevent.SetEventObject(toplevelWindow); wxevent.SetEventObject(toplevelWindow);
toplevelWindow->GetEventHandler()->ProcessEvent(wxevent); toplevelWindow->GetEventHandler()->ProcessEvent(wxevent);
// we still sending an eventNotHandledErr in order to allow for default processing // we still sending an eventNotHandledErr in order to allow for default processing
break ;
} }
break ;
case kEventWindowShown : case kEventWindowShown :
{
toplevelWindow->Refresh() ; toplevelWindow->Refresh() ;
result = noErr ; result = noErr ;
break ; break ;
}
case kEventWindowClose : case kEventWindowClose :
toplevelWindow->Close() ; toplevelWindow->Close() ;
result = noErr ; result = noErr ;
break ; break ;
case kEventWindowBoundsChanged : case kEventWindowBoundsChanged :
{ {
UInt32 attributes = cEvent.GetParameter<UInt32>(kEventParamAttributes, typeUInt32) ; UInt32 attributes = cEvent.GetParameter<UInt32>(kEventParamAttributes, typeUInt32) ;
@@ -741,15 +772,18 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand
toplevelWindow->GetEventHandler()->ProcessEvent(event) ; toplevelWindow->GetEventHandler()->ProcessEvent(event) ;
toplevelWindow->wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified toplevelWindow->wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
} }
if ( attributes & kWindowBoundsChangeOriginChanged ) if ( attributes & kWindowBoundsChangeOriginChanged )
{ {
wxMoveEvent event( r.GetLeftTop() , toplevelWindow->GetId() ) ; wxMoveEvent event( r.GetLeftTop() , toplevelWindow->GetId() ) ;
event.SetEventObject( toplevelWindow ) ; event.SetEventObject( toplevelWindow ) ;
toplevelWindow->GetEventHandler()->ProcessEvent(event) ; toplevelWindow->GetEventHandler()->ProcessEvent(event) ;
} }
result = noErr ; result = noErr ;
break ;
} }
break ;
case kEventWindowBoundsChanging : case kEventWindowBoundsChanging :
{ {
UInt32 attributes = cEvent.GetParameter<UInt32>(kEventParamAttributes,typeUInt32) ; UInt32 attributes = cEvent.GetParameter<UInt32>(kEventParamAttributes,typeUInt32) ;
@@ -760,8 +794,13 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand
// all (Mac) rects are in content area coordinates, all wxRects in structure coordinates // all (Mac) rects are in content area coordinates, all wxRects in structure coordinates
int left , top , right , bottom ; int left , top , right , bottom ;
toplevelWindow->MacGetContentAreaInset( left , top , right , bottom ) ; toplevelWindow->MacGetContentAreaInset( left , top , right , bottom ) ;
wxRect r( newRect.left - left , newRect.top - top ,
newRect.right - newRect.left + left + right , newRect.bottom - newRect.top + top + bottom ) ; wxRect r(
newRect.left - left,
newRect.top - top,
newRect.right - newRect.left + left + right,
newRect.bottom - newRect.top + top + bottom ) ;
// this is a EVT_SIZING not a EVT_SIZE type ! // this is a EVT_SIZING not a EVT_SIZE type !
wxSizeEvent wxevent( r , toplevelWindow->GetId() ) ; wxSizeEvent wxevent( r , toplevelWindow->GetId() ) ;
wxevent.SetEventObject( toplevelWindow ) ; wxevent.SetEventObject( toplevelWindow ) ;
@@ -784,11 +823,13 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand
} }
result = noErr ; result = noErr ;
break ;
} }
break ;
default : default :
break ; break ;
} }
return result ; return result ;
} }
@@ -801,18 +842,23 @@ pascal OSStatus wxMacTopLevelEventHandler( EventHandlerCallRef handler , EventRe
case kEventClassKeyboard : case kEventClassKeyboard :
result = KeyboardEventHandler( handler, event , data ) ; result = KeyboardEventHandler( handler, event , data ) ;
break ; break ;
case kEventClassTextInput : case kEventClassTextInput :
result = TextInputEventHandler( handler, event , data ) ; result = TextInputEventHandler( handler, event , data ) ;
break ; break ;
case kEventClassWindow : case kEventClassWindow :
result = wxMacTopLevelWindowEventHandler( handler, event , data ) ; result = wxMacTopLevelWindowEventHandler( handler, event , data ) ;
break ; break ;
case kEventClassMouse : case kEventClassMouse :
result = wxMacTopLevelMouseEventHandler( handler, event , data ) ; result = wxMacTopLevelMouseEventHandler( handler, event , data ) ;
break ; break ;
default : default :
break ; break ;
} }
return result ; return result ;
} }
@@ -869,23 +915,21 @@ typedef struct
{ {
wxPoint m_position ; wxPoint m_position ;
wxSize m_size ; wxSize m_size ;
} FullScreenData ; }
FullScreenData ;
void wxTopLevelWindowMac::Init() void wxTopLevelWindowMac::Init()
{ {
m_iconized = m_iconized =
m_maximizeOnShow = false; m_maximizeOnShow = false;
m_macWindow = NULL ; m_macWindow = NULL ;
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
if ( UMAGetSystemVersion() >= 0x1030 ) m_macUsesCompositing = ( UMAGetSystemVersion() >= 0x1030 );
{ #else
m_macUsesCompositing = true;
}
else
#endif
{
m_macUsesCompositing = false; m_macUsesCompositing = false;
} #endif
m_macEventHandler = NULL ; m_macEventHandler = NULL ;
m_macFullScreenData = NULL ; m_macFullScreenData = NULL ;
} }
@@ -897,10 +941,12 @@ public :
{ {
m_macWindow = windowRef ; m_macWindow = windowRef ;
} }
virtual ~wxMacDeferredWindowDeleter() virtual ~wxMacDeferredWindowDeleter()
{ {
UMADisposeWindow( (WindowRef) m_macWindow ) ; UMADisposeWindow( (WindowRef) m_macWindow ) ;
} }
protected : protected :
WindowRef m_macWindow ; WindowRef m_macWindow ;
} ; } ;
@@ -976,6 +1022,7 @@ void wxTopLevelWindowMac::Maximize(bool maximize)
wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ; wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
wxMacWindowClipper clip (this); wxMacWindowClipper clip (this);
#endif #endif
if ( !IsWindowInStandardState( (WindowRef)m_macWindow, NULL, NULL ) ) if ( !IsWindowInStandardState( (WindowRef)m_macWindow, NULL, NULL ) )
{ {
Rect rect; Rect rect;
@@ -983,6 +1030,7 @@ void wxTopLevelWindowMac::Maximize(bool maximize)
SetWindowIdealUserState((WindowRef)m_macWindow, &rect); SetWindowIdealUserState((WindowRef)m_macWindow, &rect);
SetWindowUserState((WindowRef)m_macWindow, &rect); SetWindowUserState((WindowRef)m_macWindow, &rect);
} }
ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ; ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ;
} }
@@ -1041,7 +1089,9 @@ void wxTopLevelWindowMac::MacInstallTopLevelWindowEventHandler()
{ {
verify_noerr( ::RemoveEventHandler( (EventHandlerRef) m_macEventHandler ) ) ; verify_noerr( ::RemoveEventHandler( (EventHandlerRef) m_macEventHandler ) ) ;
} }
InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacTopLevelEventHandlerUPP(),
InstallWindowEventHandler(
MAC_WXHWND(m_macWindow), GetwxMacTopLevelEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler ); GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler );
} }
@@ -1057,12 +1107,10 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
m_isShown = false; m_isShown = false;
// create frame. // create frame.
Rect theBoundsRect;
int x = (int)pos.x; int x = (int)pos.x;
int y = (int)pos.y; int y = (int)pos.y;
Rect theBoundsRect;
wxRect display = wxGetClientDisplayRect() ; wxRect display = wxGetClientDisplayRect() ;
if ( x == wxDefaultPosition.x ) if ( x == wxDefaultPosition.x )
@@ -1077,7 +1125,6 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
::SetRect(&theBoundsRect, x, y , x + w, y + h); ::SetRect(&theBoundsRect, x, y , x + w, y + h);
// translate the window attributes in the appropriate window class and attributes // translate the window attributes in the appropriate window class and attributes
WindowClass wclass = 0; WindowClass wclass = 0;
WindowAttributes attr = kWindowNoAttributes ; WindowAttributes attr = kWindowNoAttributes ;
WindowGroupRef group = NULL ; WindowGroupRef group = NULL ;
@@ -1091,11 +1138,10 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
) )
{ {
wclass = kFloatingWindowClass ; wclass = kFloatingWindowClass ;
if ( HasFlag(wxTINY_CAPTION_VERT) ) if ( HasFlag(wxTINY_CAPTION_VERT) )
{
attr |= kWindowSideTitlebarAttribute ; attr |= kWindowSideTitlebarAttribute ;
} }
}
else else
{ {
wclass = kPlainWindowClass ; wclass = kPlainWindowClass ;
@@ -1127,33 +1173,27 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
} }
} }
if ( HasFlag( wxMINIMIZE_BOX ) && wclass != kPlainWindowClass ) if ( wclass != kPlainWindowClass )
{ {
if ( HasFlag( wxMINIMIZE_BOX ) )
attr |= kWindowCollapseBoxAttribute ; attr |= kWindowCollapseBoxAttribute ;
}
if ( HasFlag( wxMAXIMIZE_BOX ) && wclass != kPlainWindowClass ) if ( HasFlag( wxMAXIMIZE_BOX ) )
{
attr |= kWindowFullZoomAttribute ; attr |= kWindowFullZoomAttribute ;
}
if ( HasFlag( wxRESIZE_BORDER ) && wclass != kPlainWindowClass ) if ( HasFlag( wxRESIZE_BORDER ) )
{
attr |= kWindowResizableAttribute ; attr |= kWindowResizableAttribute ;
}
if ( HasFlag( wxCLOSE_BOX) && wclass != kPlainWindowClass ) if ( HasFlag( wxCLOSE_BOX) )
{
attr |= kWindowCloseBoxAttribute ; attr |= kWindowCloseBoxAttribute ;
} }
if (UMAGetSystemVersion() >= 0x1000)
{
// turn on live resizing (OS X only) // turn on live resizing (OS X only)
if (UMAGetSystemVersion() >= 0x1000)
attr |= kWindowLiveResizeAttribute; attr |= kWindowLiveResizeAttribute;
}
if ( HasFlag(wxSTAY_ON_TOP) ) if ( HasFlag(wxSTAY_ON_TOP) )
{
group = GetWindowGroupOfClass(kUtilityWindowClass) ; group = GetWindowGroupOfClass(kUtilityWindowClass) ;
}
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
if ( m_macUsesCompositing ) if ( m_macUsesCompositing )
@@ -1205,7 +1245,8 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
{ {
::CreateRootControl( (WindowRef)m_macWindow , m_peer->GetControlRefAddr() ) ; ::CreateRootControl( (WindowRef)m_macWindow , m_peer->GetControlRefAddr() ) ;
} }
// the root control level handleer
// the root control level handler
MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ; MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ;
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
@@ -1216,8 +1257,6 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
} }
#endif #endif
// the frame window event handler // the frame window event handler
InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ; InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
MacInstallTopLevelWindowEventHandler() ; MacInstallTopLevelWindowEventHandler() ;
@@ -1254,7 +1293,6 @@ void wxTopLevelWindowMac::Lower()
::SendBehind( (WindowRef)m_macWindow , NULL ) ; ::SendBehind( (WindowRef)m_macWindow , NULL ) ;
} }
void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp) void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp)
{ {
if (s_macDeactivateWindow) if (s_macDeactivateWindow)
@@ -1262,6 +1300,7 @@ void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp)
wxLogTrace(TRACE_ACTIVATE, wxLogTrace(TRACE_ACTIVATE,
wxT("Doing delayed deactivation of %p"), wxT("Doing delayed deactivation of %p"),
s_macDeactivateWindow); s_macDeactivateWindow);
s_macDeactivateWindow->MacActivate(timestamp, false); s_macDeactivateWindow->MacActivate(timestamp, false);
} }
} }
@@ -1272,6 +1311,7 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
if (s_macDeactivateWindow == this) if (s_macDeactivateWindow == this)
s_macDeactivateWindow = NULL; s_macDeactivateWindow = NULL;
MacDelayedDeactivation(timestamp); MacDelayedDeactivation(timestamp);
MacPropagateHiliteChanged() ; MacPropagateHiliteChanged() ;
} }
@@ -1298,6 +1338,7 @@ bool wxTopLevelWindowMac::Show(bool show)
bool plainTransition = UMAGetSystemVersion() >= 0x1000 ; bool plainTransition = UMAGetSystemVersion() >= 0x1000 ;
if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) ) if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) )
plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ; plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ;
if ( plainTransition ) if ( plainTransition )
{ {
::ShowWindow( (WindowRef)m_macWindow ); ::ShowWindow( (WindowRef)m_macWindow );
@@ -1305,10 +1346,12 @@ bool wxTopLevelWindowMac::Show(bool show)
else else
#endif #endif
{ {
::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil); ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowShowTransitionAction, NULL );
} }
::SelectWindow( (WindowRef)m_macWindow ) ; ::SelectWindow( (WindowRef)m_macWindow ) ;
// as apps expect a size event to occur at this moment
// because apps expect a size event to occur at this moment
wxSizeEvent event( GetSize() , m_windowId); wxSizeEvent event( GetSize() , m_windowId);
event.SetEventObject(this); event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
@@ -1326,7 +1369,7 @@ bool wxTopLevelWindowMac::Show(bool show)
else else
#endif #endif
{ {
::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil); ::TransitionWindow((WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowHideTransitionAction, NULL );
} }
} }
@@ -1348,12 +1391,11 @@ bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style)
data->m_size = GetSize() ; data->m_size = GetSize() ;
if ( style & wxFULLSCREEN_NOMENUBAR ) if ( style & wxFULLSCREEN_NOMENUBAR )
{
HideMenuBar() ; HideMenuBar() ;
}
int left , top , right , bottom ;
wxRect client = wxGetClientDisplayRect() ; wxRect client = wxGetClientDisplayRect() ;
int left , top , right , bottom ;
int x, y, w, h ; int x, y, w, h ;
x = client.x ; x = client.x ;
@@ -1368,20 +1410,24 @@ bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style)
y -= top ; y -= top ;
h += top ; h += top ;
} }
if ( style & wxFULLSCREEN_NOBORDER ) if ( style & wxFULLSCREEN_NOBORDER )
{ {
x -= left ; x -= left ;
w += left + right ; w += left + right ;
h += bottom ; h += bottom ;
} }
if ( style & wxFULLSCREEN_NOTOOLBAR ) if ( style & wxFULLSCREEN_NOTOOLBAR )
{ {
// TODO // TODO
} }
if ( style & wxFULLSCREEN_NOSTATUSBAR ) if ( style & wxFULLSCREEN_NOSTATUSBAR )
{ {
// TODO // TODO
} }
SetSize( x , y , w, h ) ; SetSize( x , y , w, h ) ;
} }
else else
@@ -1390,9 +1436,11 @@ bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style)
FullScreenData *data = (FullScreenData *) m_macFullScreenData ; FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
SetPosition( data->m_position ) ; SetPosition( data->m_position ) ;
SetSize( data->m_size ) ; SetSize( data->m_size ) ;
delete data ; delete data ;
m_macFullScreenData = NULL ; m_macFullScreenData = NULL ;
} }
return false; return false;
} }
@@ -1407,6 +1455,7 @@ void wxTopLevelWindowMac::SetExtraStyle(long exStyle)
return ; return ;
wxTopLevelWindowBase::SetExtraStyle( exStyle ) ; wxTopLevelWindowBase::SetExtraStyle( exStyle ) ;
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
if ( m_macUsesCompositing && m_macWindow != NULL ) if ( m_macUsesCompositing && m_macWindow != NULL )
{ {
@@ -1417,8 +1466,7 @@ void wxTopLevelWindowMac::SetExtraStyle(long exStyle)
#endif #endif
} }
// we are still using coordinates of the content view; 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::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
{ {
@@ -1444,24 +1492,37 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
void wxTopLevelWindowMac::DoGetPosition( int *x, int *y ) const void wxTopLevelWindowMac::DoGetPosition( int *x, int *y ) const
{ {
Rect bounds ; Rect bounds ;
verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ; verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
if(x) *x = bounds.left ;
if(y) *y = bounds.top ; if (x)
*x = bounds.left ;
if (y)
*y = bounds.top ;
} }
void wxTopLevelWindowMac::DoGetSize( int *width, int *height ) const void wxTopLevelWindowMac::DoGetSize( int *width, int *height ) const
{ {
Rect bounds ; Rect bounds ;
verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ; verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
if(width) *width = bounds.right - bounds.left ;
if(height) *height = bounds.bottom - bounds.top ; if (width)
*width = bounds.right - bounds.left ;
if (height)
*height = bounds.bottom - bounds.top ;
} }
void wxTopLevelWindowMac::DoGetClientSize( int *width, int *height ) const void wxTopLevelWindowMac::DoGetClientSize( int *width, int *height ) const
{ {
Rect bounds ; Rect bounds ;
verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowContentRgn , &bounds )) ; verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowContentRgn , &bounds )) ;
if(width) *width = bounds.right - bounds.left ;
if(height) *height = bounds.bottom - bounds.top ; if (width)
*width = bounds.right - bounds.left ;
if (height)
*height = bounds.bottom - bounds.top ;
} }
void wxTopLevelWindowMac::MacSetMetalAppearance( bool set ) void wxTopLevelWindowMac::MacSetMetalAppearance( bool set )
@@ -1493,6 +1554,7 @@ wxUint32 wxTopLevelWindowMac::MacGetWindowAttributes() const
{ {
UInt32 attr = 0 ; UInt32 attr = 0 ;
GetWindowAttributes( (WindowRef) m_macWindow, &attr ) ; GetWindowAttributes( (WindowRef) m_macWindow, &attr ) ;
return attr ; return attr ;
} }
@@ -1520,6 +1582,7 @@ void wxTopLevelWindowMac::MacPerformUpdates()
currentEventClass = ::GetEventClass( currentEvent ) ; currentEventClass = ::GetEventClass( currentEvent ) ;
currentEventKind = ::GetEventKind( currentEvent ) ; currentEventKind = ::GetEventKind( currentEvent ) ;
} }
if ( currentEventClass != kEventClassMenu ) if ( currentEventClass != kEventClassMenu )
{ {
// when tracking a menu, strange redraw errors occur if we flush now, so leave.. // when tracking a menu, strange redraw errors occur if we flush now, so leave..
@@ -1539,10 +1602,13 @@ void wxTopLevelWindowMac::MacPerformUpdates()
{ {
GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn ); GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn );
UpdateControls( (WindowRef)m_macWindow , updateRgn ) ; UpdateControls( (WindowRef)m_macWindow , updateRgn ) ;
// if ( !EmptyRgn( updateRgn ) ) // if ( !EmptyRgn( updateRgn ) )
// MacDoRedraw( updateRgn , 0 , true) ; // MacDoRedraw( updateRgn , 0 , true) ;
DisposeRgn( updateRgn ); DisposeRgn( updateRgn );
} }
EndUpdate( (WindowRef)m_macWindow ) ; EndUpdate( (WindowRef)m_macWindow ) ;
QDFlushPortBuffer( GetWindowPort( (WindowRef)m_macWindow ) , NULL ) ; QDFlushPortBuffer( GetWindowPort( (WindowRef)m_macWindow ) , NULL ) ;
} }
@@ -1561,8 +1627,8 @@ static pascal void wxMacNMResponse( NMRecPtr ptr )
void wxTopLevelWindowMac::RequestUserAttention(int flags ) void wxTopLevelWindowMac::RequestUserAttention(int flags )
{ {
NMRecPtr notificationRequest = (NMRecPtr) NewPtr( sizeof( NMRec) ) ; NMRecPtr notificationRequest = (NMRecPtr) NewPtr( sizeof( NMRec) ) ;
static wxMacNMUPP nmupp( wxMacNMResponse ) static wxMacNMUPP nmupp( wxMacNMResponse );
;
memset( notificationRequest , 0 , sizeof(*notificationRequest) ) ; memset( notificationRequest , 0 , sizeof(*notificationRequest) ) ;
notificationRequest->qType = nmType ; notificationRequest->qType = nmType ;
notificationRequest->nmMark = 1 ; notificationRequest->nmMark = 1 ;
@@ -1570,6 +1636,7 @@ void wxTopLevelWindowMac::RequestUserAttention(int flags )
notificationRequest->nmSound = 0 ; notificationRequest->nmSound = 0 ;
notificationRequest->nmStr = NULL ; notificationRequest->nmStr = NULL ;
notificationRequest->nmResp = nmupp ; notificationRequest->nmResp = nmupp ;
verify_noerr( NMInstall( notificationRequest ) ) ; verify_noerr( NMInstall( notificationRequest ) ) ;
} }
@@ -1607,8 +1674,9 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
// Save the region so we can use it later // Save the region so we can use it later
SetWRefCon((WindowRef)MacGetWindowRef(), (SInt32)shapeRegion); SetWRefCon((WindowRef)MacGetWindowRef(), (SInt32)shapeRegion);
// Tell the window manager that the window has changed shape // inform the window manager that the window has changed shape
ReshapeCustomWindow((WindowRef)MacGetWindowRef()); ReshapeCustomWindow((WindowRef)MacGetWindowRef());
return true; return true;
} }
@@ -1628,14 +1696,14 @@ static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect)
inRect->right += pt.h; inRect->right += pt.h;
} }
static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param) static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param)
{ {
/*------------------------------------------------------ /*------------------------------------------------------
Define which options your custom window supports. Define which options your custom window supports.
--------------------------------------------------------*/ --------------------------------------------------------*/
//just enable everything for our demo //just enable everything for our demo
*(OptionBits*)param=//kWindowCanGrow| *(OptionBits*)param =
//kWindowCanGrow |
//kWindowCanZoom | //kWindowCanZoom |
//kWindowCanCollapse | //kWindowCanCollapse |
//kWindowCanGetWindowRegion | //kWindowCanGetWindowRegion |
@@ -1646,6 +1714,7 @@ static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param)
kWindowWantsDisposeAtProcessDeath | kWindowWantsDisposeAtProcessDeath |
kWindowSupportsGetGrowImageRegion | kWindowSupportsGetGrowImageRegion |
kWindowDefSupportsColorGrafPort; kWindowDefSupportsColorGrafPort;
return 1; return 1;
} }
@@ -1680,50 +1749,53 @@ static void wxShapedMacWindowStructureRegion(WindowRef window, RgnHandle rgn)
} }
} }
static SInt32 wxShapedMacWindowGetRegion(WindowRef window, SInt32 param) static SInt32 wxShapedMacWindowGetRegion(WindowRef window, SInt32 param)
{ {
GetWindowRegionPtr rgnRec = (GetWindowRegionPtr)param; GetWindowRegionPtr rgnRec = (GetWindowRegionPtr)param;
if (rgnRec == NULL)
return paramErr;
switch (rgnRec->regionCode) switch (rgnRec->regionCode)
{ {
case kWindowStructureRgn: case kWindowStructureRgn:
wxShapedMacWindowStructureRegion(window, rgnRec->winRgn); wxShapedMacWindowStructureRegion(window, rgnRec->winRgn);
break; break;
case kWindowContentRgn: case kWindowContentRgn:
wxShapedMacWindowContentRegion(window, rgnRec->winRgn); wxShapedMacWindowContentRegion(window, rgnRec->winRgn);
break; break;
default: default:
SetEmptyRgn(rgnRec->winRgn); SetEmptyRgn(rgnRec->winRgn);
} //switch break;
}
return noErr; return noErr;
} }
// Determine the region of the window which was hit
//
static SInt32 wxShapedMacWindowHitTest(WindowRef window, SInt32 param) static SInt32 wxShapedMacWindowHitTest(WindowRef window, SInt32 param)
{ {
/*------------------------------------------------------
Determine the region of the window which was hit
--------------------------------------------------------*/
Point hitPoint; Point hitPoint;
static RgnHandle tempRgn=nil; static RgnHandle tempRgn = NULL;
if(!tempRgn) if (tempRgn == NULL)
tempRgn = NewRgn(); tempRgn = NewRgn();
SetPt(&hitPoint,LoWord(param),HiWord(param));//get the point clicked // get the point clicked
SetPt( &hitPoint, LoWord(param), HiWord(param) );
// Mac OS 8.5 or later // Mac OS 8.5 or later
wxShapedMacWindowStructureRegion(window, tempRgn); wxShapedMacWindowStructureRegion(window, tempRgn);
if (PtInRgn( hitPoint, tempRgn )) //in window content region? if (PtInRgn( hitPoint, tempRgn )) //in window content region?
return wInContent; return wInContent;
return wNoHit;//no significant area was hit. // no significant area was hit
return wNoHit;
} }
static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param) static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param)
{ {
switch (message) switch (message)
@@ -1737,9 +1809,11 @@ static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16
// kWindowMsgGetRegion is sent during CreateCustomWindow and ReshapeCustomWindow // kWindowMsgGetRegion is sent during CreateCustomWindow and ReshapeCustomWindow
case kWindowMsgGetRegion: case kWindowMsgGetRegion:
return wxShapedMacWindowGetRegion(window, param); return wxShapedMacWindowGetRegion(window, param);
default:
break;
} }
return 0; return 0;
} }
// ---------------------------------------------------------------------------