Remove hard TABs and trailing spaces
no real changes
This commit is contained in:
@@ -153,7 +153,7 @@ bool wxGTKCairoDCImpl::DoStretchBlit(int xdest, int ydest, int dstWidth, int dst
|
|||||||
// surface and use this copy in the drawing operations.
|
// surface and use this copy in the drawing operations.
|
||||||
if ( cr == cr_src )
|
if ( cr == cr_src )
|
||||||
{
|
{
|
||||||
// Check if destination and source regions overlap.
|
// Check if destination and source regions overlap.
|
||||||
// If necessary, copy source surface to the temporary one.
|
// If necessary, copy source surface to the temporary one.
|
||||||
if (wxRect(xdest, ydest, dstWidth, dstHeight)
|
if (wxRect(xdest, ydest, dstWidth, dstHeight)
|
||||||
.Intersects(wxRect(xsrc, ysrc, srcWidth, srcHeight)))
|
.Intersects(wxRect(xsrc, ysrc, srcWidth, srcHeight)))
|
||||||
@@ -221,7 +221,7 @@ bool wxGTKCairoDCImpl::DoStretchBlit(int xdest, int ydest, int dstWidth, int dst
|
|||||||
cairo_restore(cr);
|
cairo_restore(cr);
|
||||||
if ( surfaceTmp )
|
if ( surfaceTmp )
|
||||||
{
|
{
|
||||||
cairo_surface_destroy(surfaceTmp);
|
cairo_surface_destroy(surfaceTmp);
|
||||||
}
|
}
|
||||||
m_logicalFunction = rop_save;
|
m_logicalFunction = rop_save;
|
||||||
return true;
|
return true;
|
||||||
|
@@ -510,10 +510,10 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
|
|||||||
::GetClientRect(GetHwnd(), &rc);
|
::GetClientRect(GetHwnd(), &rc);
|
||||||
wxPaintDC dc(this);
|
wxPaintDC dc(this);
|
||||||
|
|
||||||
// No need to do anything if the client rectangle is empty and, worse,
|
// No need to do anything if the client rectangle is empty and, worse,
|
||||||
// doing it would result in an assert when creating the bitmap below.
|
// doing it would result in an assert when creating the bitmap below.
|
||||||
if ( !rc.right || !rc.bottom )
|
if ( !rc.right || !rc.bottom )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// draw the entire box in a memory DC
|
// draw the entire box in a memory DC
|
||||||
wxMemoryDC memdc(&dc);
|
wxMemoryDC memdc(&dc);
|
||||||
|
@@ -502,7 +502,7 @@ void wxListWidgetCocoaImpl::ListSetSelection( unsigned int n, bool select, bool
|
|||||||
// TODO
|
// TODO
|
||||||
if ( select )
|
if ( select )
|
||||||
[m_tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:n]
|
[m_tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:n]
|
||||||
byExtendingSelection:multi];
|
byExtendingSelection:multi];
|
||||||
else
|
else
|
||||||
[m_tableView deselectRow: n];
|
[m_tableView deselectRow: n];
|
||||||
|
|
||||||
|
@@ -146,19 +146,19 @@ private:
|
|||||||
|
|
||||||
- (void)dealloc
|
- (void)dealloc
|
||||||
{
|
{
|
||||||
[playerLayer release];
|
[playerLayer release];
|
||||||
[[NSNotificationCenter defaultCenter] removeObserver:self];
|
[[NSNotificationCenter defaultCenter] removeObserver:self];
|
||||||
|
|
||||||
[self removeObserver:self forKeyPath:@"rate" context:AVSPPlayerRateContext];
|
[self removeObserver:self forKeyPath:@"rate" context:AVSPPlayerRateContext];
|
||||||
[self removeObserver:self forKeyPath:@"currentItem.status" context:AVSPPlayerItemStatusContext];
|
[self removeObserver:self forKeyPath:@"currentItem.status" context:AVSPPlayerItemStatusContext];
|
||||||
|
|
||||||
[super dealloc];
|
[super dealloc];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
|
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
|
||||||
{
|
{
|
||||||
if (context == AVSPPlayerItemStatusContext)
|
if (context == AVSPPlayerItemStatusContext)
|
||||||
{
|
{
|
||||||
id val = [change objectForKey:NSKeyValueChangeNewKey];
|
id val = [change objectForKey:NSKeyValueChangeNewKey];
|
||||||
if ( val != [NSNull null ] )
|
if ( val != [NSNull null ] )
|
||||||
{
|
{
|
||||||
@@ -180,10 +180,10 @@ private:
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (context == AVSPPlayerRateContext)
|
else if (context == AVSPPlayerRateContext)
|
||||||
{
|
{
|
||||||
NSNumber* newRate = [change objectForKey:NSKeyValueChangeNewKey];
|
NSNumber* newRate = [change objectForKey:NSKeyValueChangeNewKey];
|
||||||
if ([newRate intValue] == 0)
|
if ([newRate intValue] == 0)
|
||||||
{
|
{
|
||||||
m_backend->QueuePauseEvent();
|
m_backend->QueuePauseEvent();
|
||||||
@@ -192,11 +192,11 @@ private:
|
|||||||
{
|
{
|
||||||
m_backend->QueuePlayEvent();
|
m_backend->QueuePlayEvent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
|
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
-(wxAVMediaBackend*) backend
|
-(wxAVMediaBackend*) backend
|
||||||
@@ -220,12 +220,12 @@ private:
|
|||||||
|
|
||||||
-(BOOL)isPlaying
|
-(BOOL)isPlaying
|
||||||
{
|
{
|
||||||
if ([self rate] == 0)
|
if ([self rate] == 0)
|
||||||
{
|
{
|
||||||
return NO;
|
return NO;
|
||||||
}
|
}
|
||||||
|
|
||||||
return YES;
|
return YES;
|
||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
@@ -252,7 +252,7 @@ private:
|
|||||||
|
|
||||||
+ (Class)layerClass
|
+ (Class)layerClass
|
||||||
{
|
{
|
||||||
return [AVPlayerLayer class];
|
return [AVPlayerLayer class];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (id) initWithFrame:(CGRect)rect player:(wxAVPlayer*) player
|
- (id) initWithFrame:(CGRect)rect player:(wxAVPlayer*) player
|
||||||
@@ -500,7 +500,7 @@ bool wxAVMediaBackend::SetPlaybackRate(double dRate)
|
|||||||
|
|
||||||
bool wxAVMediaBackend::SetPosition(wxLongLong where)
|
bool wxAVMediaBackend::SetPosition(wxLongLong where)
|
||||||
{
|
{
|
||||||
[m_player seekToTime:CMTimeMakeWithSeconds(where.GetValue() / 1000.0, 1)
|
[m_player seekToTime:CMTimeMakeWithSeconds(where.GetValue() / 1000.0, 1)
|
||||||
toleranceBefore:kCMTimeZero toleranceAfter:kCMTimeZero];
|
toleranceBefore:kCMTimeZero toleranceAfter:kCMTimeZero];
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@@ -515,10 +515,10 @@ wxLongLong wxAVMediaBackend::GetDuration()
|
|||||||
{
|
{
|
||||||
AVPlayerItem *playerItem = [m_player currentItem];
|
AVPlayerItem *playerItem = [m_player currentItem];
|
||||||
|
|
||||||
if ([playerItem status] == AVPlayerItemStatusReadyToPlay)
|
if ([playerItem status] == AVPlayerItemStatusReadyToPlay)
|
||||||
return CMTimeGetSeconds([[playerItem asset] duration])*1000.0;
|
return CMTimeGetSeconds([[playerItem asset] duration])*1000.0;
|
||||||
else
|
else
|
||||||
return 0.f;
|
return 0.f;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxMediaState wxAVMediaBackend::GetState()
|
wxMediaState wxAVMediaBackend::GetState()
|
||||||
|
@@ -239,7 +239,6 @@ protected :
|
|||||||
{
|
{
|
||||||
wxUnusedVar(textField);
|
wxUnusedVar(textField);
|
||||||
|
|
||||||
|
|
||||||
return NO;
|
return NO;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -721,11 +720,11 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
|
|||||||
wxUITextField* v = [[wxUITextField alloc] initWithFrame:r];
|
wxUITextField* v = [[wxUITextField alloc] initWithFrame:r];
|
||||||
tv = v;
|
tv = v;
|
||||||
|
|
||||||
v.textColor = [UIColor blackColor];
|
v.textColor = [UIColor blackColor];
|
||||||
v.font = [UIFont systemFontOfSize:17.0];
|
v.font = [UIFont systemFontOfSize:17.0];
|
||||||
v.backgroundColor = [UIColor whiteColor];
|
v.backgroundColor = [UIColor whiteColor];
|
||||||
|
|
||||||
v.clearButtonMode = UITextFieldViewModeNever;
|
v.clearButtonMode = UITextFieldViewModeNever;
|
||||||
|
|
||||||
[v setBorderStyle:UITextBorderStyleBezel];
|
[v setBorderStyle:UITextBorderStyleBezel];
|
||||||
if ( style & wxNO_BORDER )
|
if ( style & wxNO_BORDER )
|
||||||
@@ -748,7 +747,7 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
|
|||||||
if ( !(style & wxTE_MULTILINE) )
|
if ( !(style & wxTE_MULTILINE) )
|
||||||
{
|
{
|
||||||
[tv setAutocorrectionType:UITextAutocorrectionTypeNo];
|
[tv setAutocorrectionType:UITextAutocorrectionTypeNo];
|
||||||
[tv setReturnKeyType:UIReturnKeyDone];
|
[tv setReturnKeyType:UIReturnKeyDone];
|
||||||
}
|
}
|
||||||
[tv setKeyboardType:UIKeyboardTypeDefault];
|
[tv setKeyboardType:UIKeyboardTypeDefault];
|
||||||
|
|
||||||
|
@@ -68,7 +68,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (void)dealloc {
|
- (void)dealloc {
|
||||||
[super dealloc];
|
[super dealloc];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -2738,9 +2738,9 @@ void wxWidgetImpl::RemoveAssociations(wxWidgetImpl* impl)
|
|||||||
|
|
||||||
void wxWidgetImpl::RemoveAssociation(WXWidget control)
|
void wxWidgetImpl::RemoveAssociation(WXWidget control)
|
||||||
{
|
{
|
||||||
wxCHECK_RET( control != NULL, wxT("attempt to remove a NULL WXWidget from control map") );
|
wxCHECK_RET( control != NULL, wxT("attempt to remove a NULL WXWidget from control map") );
|
||||||
|
|
||||||
wxWinMacControlList.erase(control);
|
wxWinMacControlList.erase(control);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxIMPLEMENT_ABSTRACT_CLASS(wxWidgetImpl, wxObject);
|
wxIMPLEMENT_ABSTRACT_CLASS(wxWidgetImpl, wxObject);
|
||||||
|
Reference in New Issue
Block a user