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

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,7 +235,7 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
{
wxTheApp->m_macCurrentEvent = &rec ;
wxWindow* focus = wxWindow::FindFocus() ;
if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( focus , rec.message , rec.modifiers , rec.when , rec.where.h , rec.where.v ) )
if ( (focus != NULL) && !UMAMenuEvent(&rec) && wxTheApp->MacSendKeyDownEvent( focus , rec.message , rec.modifiers , rec.when , rec.where.h , rec.where.v ) )
{
// was handled internally
result = noErr ;
@@ -322,7 +322,11 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
}
else
{
#if TARGET_CARBON
wclass = kPlainWindowClass ;
#else
wclass = kFloatingWindowClass ;
#endif
}
}
else if ( HasFlag( wxCAPTION ) )
@@ -345,7 +349,11 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
}
else
{
#if TARGET_CARBON
wclass = kPlainWindowClass ;
#else
wclass = kModalWindowClass ;
#endif
}
}
@@ -604,8 +612,8 @@ bool wxTopLevelWindowMac::Show(bool show)
return FALSE;
if (show)
{
::ShowWindow( (WindowRef)m_macWindow ) ;
{
::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
::SelectWindow( (WindowRef)m_macWindow ) ;
// no need to generate events here, they will get them triggered by macos
// actually they should be , but apparently they are not
@@ -616,7 +624,7 @@ bool wxTopLevelWindowMac::Show(bool show)
}
else
{
::HideWindow( (WindowRef)m_macWindow ) ;
::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
}
if ( !show )
@@ -675,9 +683,13 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
if ( doResize )
::SizeWindow((WindowRef)m_macWindow, m_width, m_height , true);
// the OS takes care of invalidating and erasing the new area so we only have to
// take care of refreshing for full repaints
if ( doResize && !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
Refresh() ;
// the OS takes care of invalidating and erasing the new area
// we have erased the old one
if ( IsKindOf( CLASSINFO( wxFrame ) ) )
{