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

moving / sizing patch applied

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-06-04 21:16:43 +00:00
parent 65334b43fe
commit f81bfef982
2 changed files with 74 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,6 +332,43 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe
result = noErr; result = noErr;
} }
break ; break ;
case kEventWindowBoundsChanging :
err = GetEventParameter( event, kEventParamAttributes, typeUInt32,
NULL, sizeof( UInt32 ), NULL, &attributes );
if ( err == noErr )
{
Rect newContentRect ;
GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
sizeof( newContentRect ), NULL, &newContentRect );
wxRect contentRect(newContentRect.left , newContentRect.top ,
newContentRect.right - newContentRect.left ,
newContentRect.bottom - newContentRect.top) ;
bool handled = false ;
if ((attributes & kWindowBoundsChangeSizeChanged) != 0)
{
wxSizeEvent event(contentRect , toplevelWindow->GetId());
event.SetEventObject(toplevelWindow);
handled = toplevelWindow->GetEventHandler()->ProcessEvent(event);
contentRect = event.GetRect() ;
}
else if ( attributes & kWindowBoundsChangeOriginChanged != 0)
{
wxMoveEvent event(contentRect , toplevelWindow->GetId());
event.SetEventObject(toplevelWindow);
handled = toplevelWindow->GetEventHandler()->ProcessEvent(event);
contentRect = event.GetRect() ;
}
if ( handled )
{
SetRect( &newContentRect , contentRect.GetLeft() , contentRect.GetTop() , contentRect.GetRight() , contentRect.GetBottom() ) ;
SetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, sizeof( newContentRect ), &newContentRect );
}
result = noErr ;
}
break ;
default : default :
break ; break ;
} }
@@ -702,17 +739,6 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ; InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(), InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler)); GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));
// Patch 531199 also defined a window event handler, as follows:
#if 0
// install a window event handler to send wxEVT_MOVING and wxEVT_SIZING events
EventTypeSpec events[] = { { kEventClassWindow, kEventWindowBoundsChanging } };
EventHandlerUPP handlerProc = NewEventHandlerUPP( WindowHandler );
EventHandlerRef eventHandlerRef;
InstallWindowEventHandler( m_macWindowData->m_macWindow, handlerProc, GetEventTypeCount(events),
events, (void*)this, &eventHandlerRef);
#endif
#endif #endif
m_macFocus = NULL ; m_macFocus = NULL ;

48
src/mac/toplevel.cpp
View File

@@ -332,6 +332,43 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe
result = noErr; result = noErr;
} }
break ; break ;
case kEventWindowBoundsChanging :
err = GetEventParameter( event, kEventParamAttributes, typeUInt32,
NULL, sizeof( UInt32 ), NULL, &attributes );
if ( err == noErr )
{
Rect newContentRect ;
GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
sizeof( newContentRect ), NULL, &newContentRect );
wxRect contentRect(newContentRect.left , newContentRect.top ,
newContentRect.right - newContentRect.left ,
newContentRect.bottom - newContentRect.top) ;
bool handled = false ;
if ((attributes & kWindowBoundsChangeSizeChanged) != 0)
{
wxSizeEvent event(contentRect , toplevelWindow->GetId());
event.SetEventObject(toplevelWindow);
handled = toplevelWindow->GetEventHandler()->ProcessEvent(event);
contentRect = event.GetRect() ;
}
else if ( attributes & kWindowBoundsChangeOriginChanged != 0)
{
wxMoveEvent event(contentRect , toplevelWindow->GetId());
event.SetEventObject(toplevelWindow);
handled = toplevelWindow->GetEventHandler()->ProcessEvent(event);
contentRect = event.GetRect() ;
}
if ( handled )
{
SetRect( &newContentRect , contentRect.GetLeft() , contentRect.GetTop() , contentRect.GetRight() , contentRect.GetBottom() ) ;
SetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, sizeof( newContentRect ), &newContentRect );
}
result = noErr ;
}
break ;
default : default :
break ; break ;
} }
@@ -702,17 +739,6 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ; InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(), InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler)); GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));
// Patch 531199 also defined a window event handler, as follows:
#if 0
// install a window event handler to send wxEVT_MOVING and wxEVT_SIZING events
EventTypeSpec events[] = { { kEventClassWindow, kEventWindowBoundsChanging } };
EventHandlerUPP handlerProc = NewEventHandlerUPP( WindowHandler );
EventHandlerRef eventHandlerRef;
InstallWindowEventHandler( m_macWindowData->m_macWindow, handlerProc, GetEventTypeCount(events),
events, (void*)this, &eventHandlerRef);
#endif
#endif #endif
m_macFocus = NULL ; m_macFocus = NULL ;