Compilation fix for ANSI build after r61898.

[wxWidgets.git] / src / osx / iphone / window.mm

diff --git a/src/osx/iphone/window.mm b/src/osx/iphone/window.mm
index 28aa413c6504b080af908e9e0ff55dc05360ef3a..15e4029b84c5cb753bcbde8d1fea0704a6105030 100644 (file)
--- a/src/osx/iphone/window.mm
+++ b/src/osx/iphone/window.mm
@@ -30,7 +30,7 @@ WXWidget wxWidgetImpl::FindFocus()
     {
     /*
         NSResponder* responder = [keyWindow firstResponder];
     {
     /*
         NSResponder* responder = [keyWindow firstResponder];

-        if ( [responder isKindOfClass:[NSTextView class]] && 
+        if ( [responder isKindOfClass:[NSTextView class]] &&

             [keyWindow fieldEditor:NO forObject:nil] != nil )
         {
             focusedView = [(NSTextView*)responder delegate];
             [keyWindow fieldEditor:NO forObject:nil] != nil )
         {
             focusedView = [(NSTextView*)responder delegate];


@@ -98,7 +98,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSSet* touches, UIEvent * nsEvent
     UITouch *touch = [touches anyObject];
 
     // these parameters are not given for all events
     UITouch *touch = [touches anyObject];
 
     // these parameters are not given for all events

-    UInt32 button = 0; // no secondary button 
+    UInt32 button = 0; // no secondary button

     UInt32 clickCount = [touch tapCount];
     UInt32 mouseChord = 0; // TODO does this exist for cocoa
 
     UInt32 clickCount = [touch tapCount];
     UInt32 mouseChord = 0; // TODO does this exist for cocoa
 


@@ -196,7 +196,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSSet* touches, UIEvent * nsEvent
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXIPhoneClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXIPhoneClassAddWXMethods( self );


@@ -214,13 +214,13 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSSet* touches, UIEvent * nsEvent
         CGContextRef context = (CGContextRef) UIGraphicsGetCurrentContext();
         CGContextSaveGState( context );
         // draw background
         CGContextRef context = (CGContextRef) UIGraphicsGetCurrentContext();
         CGContextSaveGState( context );
         // draw background

-        
+

         CGContextSetFillColorWithColor( context, impl->GetWXPeer()->GetBackgroundColour().GetCGColor());
         CGContextFillRect(context, rect );
 
         impl->GetWXPeer()->MacSetCGContextRef( context );
 
         CGContextSetFillColorWithColor( context, impl->GetWXPeer()->GetBackgroundColour().GetCGColor());
         CGContextFillRect(context, rect );
 
         impl->GetWXPeer()->MacSetCGContextRef( context );
 

-        impl->GetWXPeer()->GetUpdateRegion() = 
+        impl->GetWXPeer()->GetUpdateRegion() =

             wxRegion(rect.origin.x,rect.origin.y,rect.size.width,rect.size.height) ;
 
         wxPaintEvent event;
             wxRegion(rect.origin.x,rect.origin.y,rect.size.width,rect.size.height) ;
 
         wxPaintEvent event;


@@ -233,25 +233,25 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSSet* touches, UIEvent * nsEvent
 
 }
 
 
 }
 

-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event 
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event

 {
     [self handleTouchEvent:touches withEvent:event];
 }
 
 {
     [self handleTouchEvent:touches withEvent:event];
 }
 

-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event 
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event

 {
     [self handleTouchEvent:touches withEvent:event];
 }
 
 {
     [self handleTouchEvent:touches withEvent:event];
 }
 

-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event 
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event

 {
     [self handleTouchEvent:touches withEvent:event];
 }
 
 {
     [self handleTouchEvent:touches withEvent:event];
 }
 

--(void)handleTouchEvent:(NSSet *)touches withEvent:(UIEvent *)event 
-{ 
+-(void)handleTouchEvent:(NSSet *)touches withEvent:(UIEvent *)event
+{

     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );

-    CGPoint clickLocation; 
+    CGPoint clickLocation;

     UITouch *touch = [touches anyObject];
     clickLocation = [touch locationInView:self];
 
     UITouch *touch = [touches anyObject];
     clickLocation = [touch locationInView:self];
 


@@ -266,12 +266,12 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSSet* touches, UIEvent * nsEvent
 
 */
 
 
 */
 

-void wxOSX_touchEvent(UIView* self, SEL _cmd, NSSet* touches, UIEvent *event ) 
+void wxOSX_touchEvent(UIView* self, SEL _cmd, NSSet* touches, UIEvent *event )

 {
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
 {
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->touchEvent(touches, event, self, _cmd);
 }
 
     impl->touchEvent(touches, event, self, _cmd);
 }
 


@@ -280,7 +280,7 @@ BOOL wxOSX_becomeFirstResponder(UIView* self, SEL _cmd)
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     return impl->becomeFirstResponder(self, _cmd);
 }
 
     return impl->becomeFirstResponder(self, _cmd);
 }
 


@@ -289,7 +289,7 @@ BOOL wxOSX_resignFirstResponder(UIView* self, SEL _cmd)
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     return impl->resignFirstResponder(self, _cmd);
 }
 
     return impl->resignFirstResponder(self, _cmd);
 }
 


@@ -298,7 +298,7 @@ void wxOSX_drawRect(UIView* self, SEL _cmd, CGRect rect)
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     return impl->drawRect(&rect, self, _cmd);
 }
 
     return impl->drawRect(&rect, self, _cmd);
 }
 


@@ -344,7 +344,7 @@ wxWidgetIPhoneImpl::wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isR
 {
 }
 
 {
 }
 

-wxWidgetIPhoneImpl::wxWidgetIPhoneImpl() 
+wxWidgetIPhoneImpl::wxWidgetIPhoneImpl()

 {
 }
 
 {
 }
 


@@ -365,11 +365,15 @@ wxWidgetIPhoneImpl::~wxWidgetIPhoneImpl()
     }
     [m_osxView release];
 }
     }
     [m_osxView release];
 }

-    
-bool wxWidgetIPhoneImpl::IsVisible() const 
+
+bool wxWidgetIPhoneImpl::IsVisible() const

 {
 {

-    // TODO reflect Superviews state
-    return [m_osxView isHidden] == NO;
+    UIView* view = m_osxView;
+    while ( view != nil && [view isHidden] == NO )
+    {
+        view = [view superview];
+    }
+    return view == nil;

 }
 
 void wxWidgetIPhoneImpl::SetVisibility( bool visible )
 }
 
 void wxWidgetIPhoneImpl::SetVisibility( bool visible )


@@ -381,7 +385,7 @@ void wxWidgetIPhoneImpl::Raise()
 {
     [[m_osxView superview] bringSubviewToFront:m_osxView];
 }
 {
     [[m_osxView superview] bringSubviewToFront:m_osxView];
 }

-    
+

 void wxWidgetIPhoneImpl::Lower()
 {
     [[m_osxView superview] sendSubviewToBack:m_osxView];
 void wxWidgetIPhoneImpl::Lower()
 {
     [[m_osxView superview] sendSubviewToBack:m_osxView];


@@ -446,7 +450,7 @@ bool wxWidgetIPhoneImpl::HasFocus() const
     return [m_osxView isFirstResponder] == YES;
 }
 
     return [m_osxView isFirstResponder] == YES;
 }
 

-bool wxWidgetIPhoneImpl::SetFocus() 
+bool wxWidgetIPhoneImpl::SetFocus()

 {
 //    [m_osxView makeKeyWindow] ;
 //  TODO
 {
 //    [m_osxView makeKeyWindow] ;
 //  TODO


@@ -469,7 +473,7 @@ void wxWidgetIPhoneImpl::Embed( wxWidgetImpl *parent )
 void  wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to )
 {
     CGPoint p = CGPointMake( pt->x , pt->y );
 void  wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to )
 {
     CGPoint p = CGPointMake( pt->x , pt->y );

-    p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ]; 
+    p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ];

     pt->x = (int)p.x;
     pt->y = (int)p.y;
 }
     pt->x = (int)p.x;
     pt->y = (int)p.y;
 }


@@ -579,7 +583,7 @@ void wxWidgetIPhoneImpl::SetScrollThumb( wxInt32 value, wxInt32 thumbSize )
 {
 }
 
 {
 }
 

-void wxWidgetIPhoneImpl::SetControlSize( wxWindowVariant variant ) 
+void wxWidgetIPhoneImpl::SetControlSize( wxWindowVariant variant )

 {
 }
 
 {
 }
 


@@ -611,7 +615,7 @@ void wxWidgetIPhoneImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* ot
 
     if ( receivedFocus )
     {
 
     if ( receivedFocus )
     {

-        wxLogTrace(_T("Focus"), _T("focus set(%p)"), static_cast<void*>(thisWindow));
+        wxLogTrace(wxT("Focus"), wxT("focus set(%p)"), static_cast<void*>(thisWindow));

         wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
         thisWindow->HandleWindowEvent(eventFocus);
 
         wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
         thisWindow->HandleWindowEvent(eventFocus);
 


@@ -633,8 +637,8 @@ void wxWidgetIPhoneImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* ot
             thisWindow->GetCaret()->OnKillFocus();
 #endif
 
             thisWindow->GetCaret()->OnKillFocus();
 #endif
 

-        wxLogTrace(_T("Focus"), _T("focus lost(%p)"), static_cast<void*>(thisWindow));
-                    
+        wxLogTrace(wxT("Focus"), wxT("focus lost(%p)"), static_cast<void*>(thisWindow));
+

         wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
         event.SetEventObject(thisWindow);
         if (otherWindow)
         wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
         event.SetEventObject(thisWindow);
         if (otherWindow)


@@ -650,7 +654,7 @@ bool wxWidgetIPhoneImpl::becomeFirstResponder(WXWidget slf, void *_cmd)
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     // get the current focus before running becomeFirstResponder
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     // get the current focus before running becomeFirstResponder

-    UIView* otherView = FindFocus(); 
+    UIView* otherView = FindFocus();

     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     BOOL r = superimpl(slf, (SEL)_cmd);
     if ( r )
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     BOOL r = superimpl(slf, (SEL)_cmd);
     if ( r )


@@ -665,7 +669,7 @@ bool wxWidgetIPhoneImpl::resignFirstResponder(WXWidget slf, void *_cmd)
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     BOOL r = superimpl(slf, (SEL)_cmd);
     // get the current focus after running resignFirstResponder
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     BOOL r = superimpl(slf, (SEL)_cmd);
     // get the current focus after running resignFirstResponder

-    UIView* otherView = FindFocus(); 
+    UIView* otherView = FindFocus();

     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     // NSTextViews have an editor as true responder, therefore the might get the
     // resign notification if their editor takes over, don't trigger any event hen
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     // NSTextViews have an editor as true responder, therefore the might get the
     // resign notification if their editor takes over, don't trigger any event hen


@@ -681,13 +685,13 @@ void wxWidgetIPhoneImpl::drawRect(CGRect* rect, WXWidget slf, void *WXUNUSED(_cm
     CGContextRef context = (CGContextRef) UIGraphicsGetCurrentContext();
     CGContextSaveGState( context );
     // draw background
     CGContextRef context = (CGContextRef) UIGraphicsGetCurrentContext();
     CGContextSaveGState( context );
     // draw background

-    
+

     CGContextSetFillColorWithColor( context, GetWXPeer()->GetBackgroundColour().GetCGColor());
     CGContextFillRect(context, *rect );
 
     GetWXPeer()->MacSetCGContextRef( context );
 
     CGContextSetFillColorWithColor( context, GetWXPeer()->GetBackgroundColour().GetCGColor());
     CGContextFillRect(context, *rect );
 
     GetWXPeer()->MacSetCGContextRef( context );
 

-    GetWXPeer()->GetUpdateRegion() = 
+    GetWXPeer()->GetUpdateRegion() =

         wxRegion(rect->origin.x,rect->origin.y,rect->size.width,rect->size.height) ;
 
     wxRegion updateRgn( wxFromNSRect( slf, *rect ) );
         wxRegion(rect->origin.x,rect->origin.y,rect->size.width,rect->size.height) ;
 
     wxRegion updateRgn( wxFromNSRect( slf, *rect ) );


@@ -695,9 +699,9 @@ void wxWidgetIPhoneImpl::drawRect(CGRect* rect, WXWidget slf, void *WXUNUSED(_cm
     wxWindow* wxpeer = GetWXPeer();
     wxpeer->GetUpdateRegion() = updateRgn;
     wxpeer->MacSetCGContextRef( context );
     wxWindow* wxpeer = GetWXPeer();
     wxpeer->GetUpdateRegion() = updateRgn;
     wxpeer->MacSetCGContextRef( context );

-    
+

     bool handled = wxpeer->MacDoRedraw( 0 );
     bool handled = wxpeer->MacDoRedraw( 0 );

-            
+

     CGContextRestoreGState( context );
 
     CGContextSaveGState( context );
     CGContextRestoreGState( context );
 
     CGContextSaveGState( context );


@@ -706,9 +710,12 @@ void wxWidgetIPhoneImpl::drawRect(CGRect* rect, WXWidget slf, void *WXUNUSED(_cm
         // call super
         SEL _cmd = @selector(drawRect:);
         wxOSX_DrawRectHandlerPtr superimpl = (wxOSX_DrawRectHandlerPtr) [[slf superclass] instanceMethodForSelector:_cmd];
         // call super
         SEL _cmd = @selector(drawRect:);
         wxOSX_DrawRectHandlerPtr superimpl = (wxOSX_DrawRectHandlerPtr) [[slf superclass] instanceMethodForSelector:_cmd];

-        superimpl(slf, _cmd, *rect);
-        CGContextRestoreGState( context );
-        CGContextSaveGState( context );
+        if ( superimpl != wxOSX_drawRect )
+        {
+            superimpl(slf, _cmd, *rect);
+            CGContextRestoreGState( context );
+            CGContextSaveGState( context );
+        }

     }
     wxpeer->MacPaintChildrenBorders();
     wxpeer->MacSetCGContextRef( NULL );
     }
     wxpeer->MacPaintChildrenBorders();
     wxpeer->MacSetCGContextRef( NULL );


@@ -718,7 +725,7 @@ void wxWidgetIPhoneImpl::drawRect(CGRect* rect, WXWidget slf, void *WXUNUSED(_cm
 
 void wxWidgetIPhoneImpl::touchEvent(NSSet* touches, UIEvent *event, WXWidget slf, void *WXUNUSED(_cmd))
 {
 
 void wxWidgetIPhoneImpl::touchEvent(NSSet* touches, UIEvent *event, WXWidget slf, void *WXUNUSED(_cmd))
 {

-    CGPoint clickLocation; 
+    CGPoint clickLocation;

     UITouch *touch = [touches anyObject];
     clickLocation = [touch locationInView:slf];
     wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
     UITouch *touch = [touches anyObject];
     clickLocation = [touch locationInView:slf];
     wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );


@@ -741,12 +748,12 @@ void wxWidgetIPhoneImpl::touchUpInsideAction(void* sender, WX_UIEvent evt, WXWid
 // Factory methods
 //
 
 // Factory methods
 //
 

-wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent), 
+wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent),

     wxWindowID WXUNUSED(id), const wxPoint& pos, const wxSize& size,
     long WXUNUSED(style), long WXUNUSED(extraStyle))
 {
     UIView* sv = (wxpeer->GetParent()->GetHandle() );
     wxWindowID WXUNUSED(id), const wxPoint& pos, const wxSize& size,
     long WXUNUSED(style), long WXUNUSED(extraStyle))
 {
     UIView* sv = (wxpeer->GetParent()->GetHandle() );

-    
+

     CGRect r = CGRectMake( pos.x, pos.y, size.x, size.y) ;
     // Rect bounds = wxMacGetBoundsForControl( wxpeer, pos , size ) ;
     wxUIView* v = [[wxUIView alloc] initWithFrame:r];
     CGRect r = CGRectMake( pos.x, pos.y, size.x, size.y) ;
     // Rect bounds = wxMacGetBoundsForControl( wxpeer, pos , size ) ;
     wxUIView* v = [[wxUIView alloc] initWithFrame:r];


@@ -757,7 +764,7 @@ wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WX
     return c;
 }
 
     return c;
 }
 

-wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now ) 
+wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )

 {
     UIWindow* toplevelwindow = now->GetWXWindow();
 
 {
     UIWindow* toplevelwindow = now->GetWXWindow();
 


@@ -768,18 +775,18 @@ wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
     /*
     UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
     // left orientation not yet implemented !
     /*
     UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
     // left orientation not yet implemented !

-    if (orientation == UIInterfaceOrientationLandscapeRight ) 
+    if (orientation == UIInterfaceOrientationLandscapeRight )

     {
         CGAffineTransform transform = v.transform;
     {
         CGAffineTransform transform = v.transform;

- 
+

         // Use the status bar frame to determine the center point of the window's content area.
         CGRect statusBarFrame = [[UIApplication sharedApplication] statusBarFrame];
         CGRect bounds = CGRectMake(0, 0, statusBarFrame.size.height, statusBarFrame.origin.x);
         CGPoint center = CGPointMake(bounds.size.height / 2.0, bounds.size.width / 2.0);
         // Use the status bar frame to determine the center point of the window's content area.
         CGRect statusBarFrame = [[UIApplication sharedApplication] statusBarFrame];
         CGRect bounds = CGRectMake(0, 0, statusBarFrame.size.height, statusBarFrame.origin.x);
         CGPoint center = CGPointMake(bounds.size.height / 2.0, bounds.size.width / 2.0);

- 
+

         // Set the center point of the view to the center point of the window's content area.
         v.center = center;
         // Set the center point of the view to the center point of the window's content area.
         v.center = center;

- 
+

         // Rotate the view 90 degrees around its new center point.
         transform = CGAffineTransformRotate(transform, ( M_PI / 2.0));
         v.transform = transform;
         // Rotate the view 90 degrees around its new center point.
         transform = CGAffineTransformRotate(transform, ( M_PI / 2.0));
         v.transform = transform;