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

cleanup - reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-02-05 07:27:48 +00:00
parent 61fa2e39da
commit b46dde2772
1 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/mac/carbon/window.cpp
View File

@@ -41,11 +41,15 @@
#include "wx/caret.h" #include "wx/caret.h"
#endif #endif
#define MAC_SCROLLBAR_SIZE 15 #if wxUSE_DRAG_AND_DROP
#define MAC_SMALL_SCROLLBAR_SIZE 11 #include "wx/dnd.h"
#endif
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#define MAC_SCROLLBAR_SIZE 15
#define MAC_SMALL_SCROLLBAR_SIZE 11
#ifndef __DARWIN__ #ifndef __DARWIN__
#include <Windows.h> #include <Windows.h>
#include <ToolUtils.h> #include <ToolUtils.h>
@@ -59,10 +63,6 @@
#endif #endif
#endif #endif
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif
#include <string.h> #include <string.h>
extern wxList wxPendingDelete; extern wxList wxPendingDelete;
@@ -530,7 +530,6 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even
// EVT_CHAR // EVT_CHAR
for (int pos=0 ; pos < numChars ; pos++) for (int pos=0 ; pos < numChars ; pos++)
{ {
WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ; WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ;
WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ; WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
wxTheApp->MacSetCurrentEvent( event , handler ) ; wxTheApp->MacSetCurrentEvent( event , handler ) ;
@@ -565,7 +564,6 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even
// EVT_CHAR // EVT_CHAR
for (int pos=0 ; pos < numChars ; pos++) for (int pos=0 ; pos < numChars ; pos++)
{ {
WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ; WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ;
WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ; WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
wxTheApp->MacSetCurrentEvent( event , handler ) ; wxTheApp->MacSetCurrentEvent( event , handler ) ;
@@ -584,12 +582,11 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even
break ; break ;
} }
delete[] uniChars ; delete [] uniChars ;
if ( charBuf != buf ) if ( charBuf != buf )
delete[] charBuf ; delete [] charBuf ;
return result ; return result ;
} }
static pascal OSStatus wxMacWindowCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) static pascal OSStatus wxMacWindowCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
@@ -714,6 +711,7 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
case kEventClassTextInput : case kEventClassTextInput :
result = wxMacUnicodeTextEventHandler( handler , event , data ) ; result = wxMacUnicodeTextEventHandler( handler , event , data ) ;
break ; break ;
default : default :
break ; break ;
} }
@@ -964,7 +962,6 @@ void wxWindowMac::Init()
wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
} }
// Destructor
wxWindowMac::~wxWindowMac() wxWindowMac::~wxWindowMac()
{ {
SendDestroyEvent(); SendDestroyEvent();
@@ -985,7 +982,7 @@ wxWindowMac::~wxWindowMac()
break; break;
} }
} }
#endif // __WXUNIVERSAL__ #endif
// destroy children before destroying this window itself // destroy children before destroying this window itself
DestroyChildren(); DestroyChildren();