fixes #13826

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

diff --git a/src/osx/iphone/window.mm b/src/osx/iphone/window.mm
index 2858e3ccc3f68daf5779f0b6e2ec196c7112aba6..d453aa88710ab81becb7a32ce4a8415e7a1f55f7 100644 (file)
--- a/src/osx/iphone/window.mm
+++ b/src/osx/iphone/window.mm
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-06-20
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2008-06-20

-// RCS-ID:      $Id: window.mm 48805 2007-09-19 14:52:25Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -20,6 +20,8 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

+#include "wx/textctrl.h"
+

 #include <objc/runtime.h>
 
 WXWidget wxWidgetImpl::FindFocus()
 #include <objc/runtime.h>
 
 WXWidget wxWidgetImpl::FindFocus()


@@ -56,11 +58,6 @@ CGRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
     return wxToNSRect( sv, bounds );
 }
 
     return wxToNSRect( sv, bounds );
 }
 

-@interface wxUIView : UIView
-{
-}
-
-@end // wxUIView

 
 @interface wxUIView(PossibleMethods)
 - (void)setTitle:(NSString *)title forState:(UIControlState)state;
 
 @interface wxUIView(PossibleMethods)
 - (void)setTitle:(NSString *)title forState:(UIControlState)state;


@@ -76,18 +73,6 @@ CGRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
 - (BOOL) resignFirstResponder;
 @end
 
 - (BOOL) resignFirstResponder;
 @end
 

-@interface wxUIContentView : wxUIView
-{
-}
-
-@end
-
-@interface wxUIContentViewController : UIViewController
-{
-}
-
-@end
-

 //
 //
 //
 //
 //
 //


@@ -313,34 +298,39 @@ void wxOSXIPhoneClassAddWXMethods(Class c)
     class_addMethod(c, @selector(drawRect:), (IMP) wxOSX_drawRect, "v@:{_CGRect={_CGPoint=ff}{_CGSize=ff}}" );
 }
 
     class_addMethod(c, @selector(drawRect:), (IMP) wxOSX_drawRect, "v@:{_CGRect={_CGPoint=ff}{_CGSize=ff}}" );
 }
 

-@implementation wxUIContentView
+//
+// UIControl extensions
+//
+
+@interface UIControl (wxUIControlActionSupport)
+
+- (void) WX_touchUpInsideAction:(id)sender event:(UIEvent*)event;
+- (void) WX_valueChangedAction:(id)sender event:(UIEvent*)event;

 
 @end
 
 
 @end
 

-@implementation wxUIContentViewController
+@implementation UIControl (wxUIControlActionSupport)

 
 

-- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation
+- (void) WX_touchUpInsideAction:(id)sender event:(UIEvent*)event

 {
 {

-    return YES;
+    wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl != NULL)
+        impl->controlAction(sender, UIControlEventTouchUpInside, event);

 }
 
 }
 

-- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+- (void) WX_valueChangedAction:(id)sender event:(UIEvent*)event

 {
 {

-    CGRect fr = [self.view frame];
-//    CGRect cv = [[self.view superview] frame];
-//    CGRect bounds = CGRectMake( 0,0,fr.size.width, fr.size.height);
-//    [[self.view superview] setFrame: fr ];
-//    [self.view setFrame: bounds];
-//    [self.view setNeedsDisplayInRect:bounds];
+    wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl != NULL)
+        impl->controlAction(sender, UIControlEventValueChanged, event);

 }
 
 @end
 
 }
 
 @end
 

-

 IMPLEMENT_DYNAMIC_CLASS( wxWidgetIPhoneImpl , wxWidgetImpl )
 
 IMPLEMENT_DYNAMIC_CLASS( wxWidgetIPhoneImpl , wxWidgetImpl )
 

-wxWidgetIPhoneImpl::wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl ) :
-    wxWidgetImpl( peer, isRootControl ), m_osxView(w)
+wxWidgetIPhoneImpl::wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl, bool isUserPane ) :
+    wxWidgetImpl( peer, isRootControl, isUserPane ), m_osxView(w)

 {
 }
 
 {
 }
 


@@ -372,8 +362,6 @@ bool wxWidgetIPhoneImpl::IsVisible() const
     while ( view != nil && [view isHidden] == NO )
     {
         view = [view superview];
     while ( view != nil && [view isHidden] == NO )
     {
         view = [view superview];

-        if (view != nil && [view isHidden])
-            NSLog(@"visible test failed for %@",view); 

     }
     return view == nil;
 }
     }
     return view == nil;
 }


@@ -404,6 +392,8 @@ void wxWidgetIPhoneImpl::Move(int x, int y, int width, int height)
     [m_osxView setFrame:r];
 }
 
     [m_osxView setFrame:r];
 }
 

+
+

 void wxWidgetIPhoneImpl::GetPosition( int &x, int &y ) const
 {
     CGRect r = [m_osxView frame];
 void wxWidgetIPhoneImpl::GetPosition( int &x, int &y ) const
 {
     CGRect r = [m_osxView frame];


@@ -421,7 +411,9 @@ void wxWidgetIPhoneImpl::GetSize( int &width, int &height ) const
 void wxWidgetIPhoneImpl::GetContentArea( int&left, int &top, int &width, int &height ) const
 {
     left = top = 0;
 void wxWidgetIPhoneImpl::GetContentArea( int&left, int &top, int &width, int &height ) const
 {
     left = top = 0;

-    GetSize( width, height );
+    CGRect rect = [m_osxView bounds];
+    width = rect.size.width;
+    height = rect.size.height;

 }
 
 void wxWidgetIPhoneImpl::SetNeedsDisplay( const wxRect* where )
 }
 
 void wxWidgetIPhoneImpl::SetNeedsDisplay( const wxRect* where )


@@ -482,7 +474,19 @@ void  wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to
 
 void wxWidgetIPhoneImpl::SetBackgroundColour( const wxColour &col )
 {
 
 void wxWidgetIPhoneImpl::SetBackgroundColour( const wxColour &col )
 {

-    // m_osxView.backgroundColor = [[UIColor alloc] initWithCGColor:col.GetCGColor()];
+    m_osxView.backgroundColor = [[UIColor alloc] initWithCGColor:col.GetCGColor()];
+}
+
+bool wxWidgetIPhoneImpl::SetBackgroundStyle(wxBackgroundStyle style) 
+{
+    if ( style == wxBG_STYLE_PAINT )
+        [m_osxView setOpaque: YES ];
+    else
+    {
+        [m_osxView setOpaque: NO ];
+        m_osxView.backgroundColor = [UIColor clearColor];
+    }
+    return true;

 }
 
 void wxWidgetIPhoneImpl::SetLabel(const wxString& title, wxFontEncoding encoding)
 }
 
 void wxWidgetIPhoneImpl::SetLabel(const wxString& title, wxFontEncoding encoding)


@@ -492,11 +496,13 @@ void wxWidgetIPhoneImpl::SetLabel(const wxString& title, wxFontEncoding encoding
         wxCFStringRef cf( title , encoding );
         [m_osxView setTitle:cf.AsNSString() forState:UIControlStateNormal ];
     }
         wxCFStringRef cf( title , encoding );
         [m_osxView setTitle:cf.AsNSString() forState:UIControlStateNormal ];
     }

+#if 0 // nonpublic API problems

     else if ( [m_osxView respondsToSelector:@selector(setStringValue:) ] )
     {
         wxCFStringRef cf( title , encoding );
         [m_osxView setStringValue:cf.AsNSString()];
     }
     else if ( [m_osxView respondsToSelector:@selector(setStringValue:) ] )
     {
         wxCFStringRef cf( title , encoding );
         [m_osxView setStringValue:cf.AsNSString()];
     }

+#endif

 }
 
 
 }
 
 


@@ -589,6 +595,14 @@ void wxWidgetIPhoneImpl::SetControlSize( wxWindowVariant variant )
 {
 }
 
 {
 }
 

+float wxWidgetIPhoneImpl::GetContentScaleFactor() const 
+{
+    if ( [m_osxView respondsToSelector:@selector(contentScaleFactor) ])
+        return [m_osxView contentScaleFactor];
+    else 
+        return 1.0;
+}
+

 void wxWidgetIPhoneImpl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack )
 {
 }
 void wxWidgetIPhoneImpl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack )
 {
 }


@@ -597,13 +611,12 @@ void wxWidgetIPhoneImpl::InstallEventHandler( WXWidget control )
 {
     WXWidget c =  control ? control : (WXWidget) m_osxView;
     wxWidgetImpl::Associate( c, this ) ;
 {
     WXWidget c =  control ? control : (WXWidget) m_osxView;
     wxWidgetImpl::Associate( c, this ) ;

-
-   if ([c isKindOfClass:[UIControl class] ])
+    
+    if ([c isKindOfClass:[UIControl class] ])

     {
         UIControl* cc = (UIControl*) c;
     {
         UIControl* cc = (UIControl*) c;

-        /*
-        [cc addTarget:self action:@selector(touchUpInsideAction:event:) forControlEvents:UIControlEventTouchUpInside];
-        */
+        [cc addTarget:cc action:@selector(WX_touchUpInsideAction:event:) forControlEvents:UIControlEventTouchUpInside];
+        [cc addTarget:cc action:@selector(WX_valueChangedAction:event:) forControlEvents:UIControlEventValueChanged];

     }
 }
 
     }
 }
 


@@ -687,10 +700,10 @@ 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 );
     CGContextSetFillColorWithColor( context, GetWXPeer()->GetBackgroundColour().GetCGColor());
     CGContextFillRect(context, *rect );

-
+*/

     GetWXPeer()->MacSetCGContextRef( context );
 
     GetWXPeer()->GetUpdateRegion() =
     GetWXPeer()->MacSetCGContextRef( context );
 
     GetWXPeer()->GetUpdateRegion() =


@@ -727,23 +740,50 @@ 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;
+    bool inRecursion = false;
+    if ( inRecursion )
+        return;
+    

     UITouch *touch = [touches anyObject];
     UITouch *touch = [touches anyObject];

-    clickLocation = [touch locationInView:slf];
-    wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
-
-    wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
-    SetupMouseEvent( wxevent , touches, event ) ;
-    wxevent.m_x = pt.x;
-    wxevent.m_y = pt.y;
-    wxevent.SetEventObject( GetWXPeer() ) ;
-    //?wxevent.SetId( GetWXPeer()->GetId() ) ;
+    CGPoint clickLocation;
+    if ( [touch view] != slf && IsRootControl() )
+    {
+        NSLog(@"self is %@ and touch view is %@",slf,[touch view]);
+        inRecursion = true;
+        inRecursion = false;
+    }
+    else 
+    {
+        clickLocation = [touch locationInView:slf];
+        wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
+        
+        wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
+        SetupMouseEvent( wxevent , touches, event ) ;
+        wxevent.m_x = pt.x;
+        wxevent.m_y = pt.y;
+        wxevent.SetEventObject( GetWXPeer() ) ;
+        //?wxevent.SetId( GetWXPeer()->GetId() ) ;
+        
+        GetWXPeer()->HandleWindowEvent(wxevent);
+    }
+}

 
 

-    GetWXPeer()->HandleWindowEvent(wxevent);
+void wxWidgetIPhoneImpl::controlAction(void* sender, wxUint32 controlEvent, WX_UIEvent rawEvent)
+{
+    if ( controlEvent == UIControlEventTouchUpInside )
+        GetWXPeer()->OSXHandleClicked(0);

 }
 
 }
 

-void wxWidgetIPhoneImpl::touchUpInsideAction(void* sender, WX_UIEvent evt, WXWidget slf, void* _cmd)
+void wxWidgetIPhoneImpl::controlTextDidChange()

 {
 {

+    wxTextCtrl* wxpeer = wxDynamicCast((wxWindow*)GetWXPeer(),wxTextCtrl);
+    if ( wxpeer ) 
+    {
+        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, wxpeer->GetId());
+        event.SetEventObject( wxpeer );
+        event.SetString( wxpeer->GetValue() );
+        wxpeer->HandleWindowEvent( event );
+    }

 }
 
 //
 }
 
 //


@@ -762,41 +802,7 @@ wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WX
     sv.clipsToBounds = YES;
     sv.contentMode =  UIViewContentModeRedraw;
     sv.clearsContextBeforeDrawing = NO;
     sv.clipsToBounds = YES;
     sv.contentMode =  UIViewContentModeRedraw;
     sv.clearsContextBeforeDrawing = NO;

-    wxWidgetIPhoneImpl* c = new wxWidgetIPhoneImpl( wxpeer, v );
+    wxWidgetIPhoneImpl* c = new wxWidgetIPhoneImpl( wxpeer, v, false, true );

     return c;
 }
 
     return c;
 }
 

-wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
-{
-    UIWindow* toplevelwindow = now->GetWXWindow();
-
-    wxUIContentView* contentview = [[wxUIContentView alloc] initWithFrame:[toplevelwindow bounds]];
-    contentview.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    wxUIContentViewController* controller = [[wxUIContentViewController alloc] init];
-    controller.view = contentview;
-    /*
-    UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
-    // left orientation not yet implemented !
-    if (orientation == UIInterfaceOrientationLandscapeRight )
-    {
-        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);
-
-        // 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;
-    }
-    */
-    wxWidgetIPhoneImpl* impl = new wxWidgetIPhoneImpl( now, contentview, true );
-    impl->InstallEventHandler();
-    [toplevelwindow addSubview:contentview];
-    return impl;
-}
-