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