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

fix null-deref

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-03-28 19:55:24 +00:00
parent 70b5f65e55
commit 30c23e741e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ static const EventTypeSpec eventList[] =
{ kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } , { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
{ kEventClassTextInput, kEventTextInputUpdateActiveInputArea } , { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } ,
{ kEventClassWindow , kEventWindowShown } , { kEventClassWindow , kEventWindowShown } ,
{ kEventClassWindow , kEventWindowActivated } , { kEventClassWindow , kEventWindowActivated } ,
{ kEventClassWindow , kEventWindowDeactivated } , { kEventClassWindow , kEventWindowDeactivated } ,
@@ -448,7 +448,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ; Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
Point windowMouseLocation = screenMouseLocation ; Point windowMouseLocation = screenMouseLocation ;
WindowRef window ; WindowRef window = NULL;
short windowPart = ::FindWindow(screenMouseLocation, &window); short windowPart = ::FindWindow(screenMouseLocation, &window);
wxWindow* currentMouseWindow = NULL ; wxWindow* currentMouseWindow = NULL ;
@@ -1416,11 +1416,11 @@ bool wxTopLevelWindowMac::IsFullScreen() const
return m_macFullScreenData != NULL ; return m_macFullScreenData != NULL ;
} }
void wxTopLevelWindowMac::SetExtraStyle(long exStyle) void wxTopLevelWindowMac::SetExtraStyle(long exStyle)
{ {
if ( GetExtraStyle() == exStyle ) if ( GetExtraStyle() == exStyle )
return ; return ;
wxTopLevelWindowBase::SetExtraStyle( exStyle ) ; wxTopLevelWindowBase::SetExtraStyle( exStyle ) ;
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
@@ -1433,8 +1433,8 @@ void wxTopLevelWindowMac::SetExtraStyle(long exStyle)
#endif #endif
} }
// TODO: switch to structure bounds -
// we are still using coordinates of the content view // 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 )
{ {