#define wxOSX_USE_CORE_TEXT 0
#define wxOSX_USE_ATSU_TEXT 0
+#define wxHAS_OPENGL_ES
/*
* turning off capabilities that don't work under iphone yet
#endif
#define wxUSE_BUTTON 1
-#define wxUSE_CARET 1
-#define wxUSE_CHOICE 1
-#define wxUSE_SCROLLBAR 1
-#define wxUSE_STATUSBAR 1
+
+#if wxUSE_CARET
+#undef wxUSE_CARET
+#define wxUSE_CARET 0
+#endif
+
+#if wxUSE_CHOICE
+#undef wxUSE_CHOICE
+#define wxUSE_CHOICE 0
+#endif
+
+#if wxUSE_COMBOBOX
+#undef wxUSE_COMBOBOX
+#define wxUSE_COMBOBOX 0
+#endif
+
+#undef wxUSE_SCROLLBAR
+#define wxUSE_SCROLLBAR 0
+
+#undef wxUSE_STATUSBAR
+#undef wxUSE_NATIVE_STATUSBAR
+#undef wxUSE_TEXTCTRL
+#undef wxUSE_ABOUTDLG
+#undef wxUSE_STATTEXT
+#undef wxUSE_STATLINE
+#undef wxUSE_COLLPANE
+#undef wxUSE_STATBMP
+#undef wxUSE_STATBOX
+#undef wxUSE_CHECKBOX
+#undef wxUSE_RADIOBTN
+#undef wxUSE_RADIOBOX
+#undef wxUSE_TOGGLEBTN
+
+
+#define wxUSE_STATUSBAR 0
#define wxUSE_NATIVE_STATUSBAR 0
-#define wxUSE_TEXTCTRL 1
-#define wxUSE_ABOUTDLG 1
-#define wxUSE_STATTEXT 1
-#define wxUSE_STATLINE 1
-#define wxUSE_COLLPANE 1
-#define wxUSE_STATBMP 1
-#define wxUSE_STATBOX 1
-#define wxUSE_CHECKBOX 1
-#define wxUSE_RADIOBTN 1
-#define wxUSE_RADIOBOX 1
-#define wxUSE_TOGGLEBTN 1
+#define wxUSE_TEXTCTRL 0
+#define wxUSE_ABOUTDLG 0
+#define wxUSE_STATTEXT 0
+#define wxUSE_STATLINE 0
+#define wxUSE_COLLPANE 0
+#define wxUSE_STATBMP 0
+#define wxUSE_STATBOX 0
+#define wxUSE_CHECKBOX 0
+#define wxUSE_RADIOBTN 0
+#define wxUSE_RADIOBOX 0
+#define wxUSE_TOGGLEBTN 0
+
+#undef wxUSE_TOOLBAR
+#undef wxUSE_HTML
#define wxUSE_TOOLBAR 0
#define wxUSE_HTML 0
+#undef wxUSE_RICHTEXT
#define wxUSE_RICHTEXT 0
+#undef wxUSE_ANIMATIONCTRL
+#undef wxUSE_CALENDARCTRL
+#undef wxUSE_COMBOCTRL
+#undef wxUSE_ODCOMBOBOX
+#undef wxUSE_BITMAPCOMBOBOX
+#undef wxUSE_BMPBUTTON
+#undef wxUSE_CHECKLISTBOX
+#undef wxUSE_GAUGE
+#undef wxUSE_GRID
+#undef wxUSE_LISTBOX
+#undef wxUSE_LISTCTRL
+#undef wxUSE_NOTEBOOK
+#undef wxUSE_SLIDER
+#undef wxUSE_SPINBTN
+#undef wxUSE_SPINCTRL
+#undef wxUSE_TREECTRL
+#undef wxUSE_DATEPICKCTRL
+#undef wxUSE_DATAVIEWCTRL
+#undef wxUSE_EDITABLELISTBOX
+#undef wxUSE_FILEPICKERCTRL
+#undef wxUSE_DIRPICKERCTRL
+#undef wxUSE_FILECTRL
+#undef wxUSE_COLOURPICKERCTRL
+#undef wxUSE_FONTPICKERCTRL
+#undef wxUSE_DEBUGREPORT
+#undef wxUSE_HYPERLINKCTRL
+#undef wxUSE_STC
+#undef wxUSE_AUI
+#undef wxUSE_BUSYINFO
+#undef wxUSE_SEARCHCTRL
+
#define wxUSE_ANIMATIONCTRL 0
#define wxUSE_CALENDARCTRL 0
-#define wxUSE_COMBOBOX 0
#define wxUSE_COMBOCTRL 0
#define wxUSE_ODCOMBOBOX 0
#define wxUSE_BITMAPCOMBOBOX 0
#define wxUSE_BUSYINFO 0
#define wxUSE_SEARCHCTRL 0
+#undef wxUSE_LOGWINDOW
+#undef wxUSE_LOG_DIALOG
+#undef wxUSE_LISTBOOK
+#undef wxUSE_CHOICEBOOK
+#undef wxUSE_TREEBOOK
+#undef wxUSE_TOOLBOOK
+#undef wxUSE_CHOICEDLG
+#undef wxUSE_HELP
+#undef wxUSE_PROGRESSDLG
+#undef wxUSE_FONTDLG
+#undef wxUSE_FILEDLG
+#undef wxUSE_CHOICEDLG
+#undef wxUSE_NUMBERDLG
+#undef wxUSE_TEXTDLG
+#undef wxUSE_DIRDLG
+#undef wxUSE_STARTUP_TIPS
+#undef wxUSE_WIZARDDLG
+#undef wxUSE_TOOLBAR_NATIVE
+#undef wxUSE_FINDREPLDLG
+#undef wxUSE_TASKBARICON
+#undef wxUSE_REARRANGECTRL
+
#define wxUSE_LOGWINDOW 0
#define wxUSE_LOG_DIALOG 0
#define wxUSE_LISTBOOK 0
#define wxUSE_TOOLBAR_NATIVE 0
#define wxUSE_FINDREPLDLG 0
#define wxUSE_TASKBARICON 0
+#define wxUSE_REARRANGECTRL 0
+
+#if wxUSE_WXHTML_HELP
+#undef wxUSE_WXHTML_HELP
+#define wxUSE_WXHTML_HELP 0
+#endif
+
+#if wxUSE_DOC_VIEW_ARCHITECTURE
+#undef wxUSE_DOC_VIEW_ARCHITECTURE
+#define wxUSE_DOC_VIEW_ARCHITECTURE 0
+#endif
+
+#if wxUSE_PRINTING_ARCHITECTURE
+#undef wxUSE_PRINTING_ARCHITECTURE
+#define wxUSE_PRINTING_ARCHITECTURE 0
+#endif
+#if wxUSE_MENUS
+#undef wxUSE_MENUS
+#define wxUSE_MENUS 0
+#endif
/*
#if wxUSE_POPUPWIN
#endif
-#if wxUSE_MENUS
-#undef wxUSE_MENUS
-#define wxUSE_MENUS 0
-#endif
#if wxUSE_CALENDARCTRL
#undef wxUSE_CALENDARCTRL
#define wxUSE_CALENDARCTRL 0
#endif
-#if wxUSE_WXHTML_HELP
-#undef wxUSE_WXHTML_HELP
-#define wxUSE_WXHTML_HELP 0
-#endif
-
-#if wxUSE_DOC_VIEW_ARCHITECTURE
-#undef wxUSE_DOC_VIEW_ARCHITECTURE
-#define wxUSE_DOC_VIEW_ARCHITECTURE 0
-#endif
-
-#if wxUSE_PRINTING_ARCHITECTURE
-#undef wxUSE_PRINTING_ARCHITECTURE
-#define wxUSE_PRINTING_ARCHITECTURE 0
-#endif
-
*/
#if wxUSE_CLIPBOARD
#define wxUSE_CLIPBOARD 0
#endif // wxUSE_CLIPBOARD
+#if wxUSE_GLCANVAS
+#undef wxUSE_GLCANVAS
+#define wxUSE_GLCANVAS 0
+#endif // wxUSE_GLCANVAS
+
+
+#if wxUSE_COLOURDLG
+#undef wxUSE_COLOURDLG
+#define wxUSE_COLOURDLG 0
+#endif // wxUSE_COLOURDLG
+
#endif
/* _WX_OSX_IPHONE_CHKCONF_H_ */
#if wxUSE_GUI
+OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
+ CGContextRef inContext,
+ const CGRect * inBounds,
+ CGImageRef inImage) ;
+
+WX_UIImage WXDLLIMPEXP_CORE wxOSXCreateUIImageFromCGImage( CGImageRef image );
+
class WXDLLIMPEXP_CORE wxWidgetIPhoneImpl : public wxWidgetImpl
{
public :
virtual void Move(int x, int y, int width, int height);
virtual void GetPosition( int &x, int &y ) const;
virtual void GetSize( int &width, int &height ) const;
+ virtual void SetControlSize( wxWindowVariant variant );
virtual void SetNeedsDisplay( const wxRect* where = NULL );
virtual bool GetNeedsDisplay() const;
void RemoveFromParent();
void Embed( wxWidgetImpl *parent );
+
+ void SetDefaultButton( bool isDefault );
+ void PerformClick();
+ virtual void SetLabel(const wxString& title, wxFontEncoding encoding);
+
+ void SetCursor( const wxCursor & cursor );
+ void CaptureMouse();
+ void ReleaseMouse();
+
+ wxInt32 GetValue() const;
+ void SetValue( wxInt32 v );
+ void SetBitmap( const wxBitmap& bitmap );
+ void SetupTabs( const wxNotebook ¬ebook );
+ void GetBestRect( wxRect *r ) const;
+ bool IsEnabled() const;
+ void Enable( bool enable );
+ bool ButtonClickDidStateChange() { return true ;}
+ void SetMinimum( wxInt32 v );
+ void SetMaximum( wxInt32 v );
+ wxInt32 GetMinimum() const;
+ wxInt32 GetMaximum() const;
+ void PulseGauge();
+ void SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
+
+ void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
+
+ void InstallEventHandler( WXWidget control = NULL );
+
+ virtual void DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
+
+ // thunk connected calls
+
+ virtual void drawRect(CGRect* rect, WXWidget slf, void* _cmd);
+ virtual void touchEvent(WX_NSSet touches, WX_UIEvent event, WXWidget slf, void* _cmd);
+ virtual bool becomeFirstResponder(WXWidget slf, void* _cmd);
+ virtual bool resignFirstResponder(WXWidget slf, void* _cmd);
+
+ // action
+
+ virtual void touchUpInsideAction(void* sender, WX_UIEvent evt, WXWidget slf, void* _cmd);
+
protected:
WXWidget m_osxView;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetIPhoneImpl)
DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowIPhoneImpl)
};
+#ifdef __OBJC__
+
+ WXDLLIMPEXP_CORE CGRect wxToNSRect( UIView* parent, const wxRect& r );
+ WXDLLIMPEXP_CORE wxRect wxFromNSRect( UIView* parent, const CGRect& rect );
+ WXDLLIMPEXP_CORE CGPoint wxToNSPoint( UIView* parent, const wxPoint& p );
+ WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( UIView* parent, const CGPoint& p );
+
+ CGRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,
+ bool adjustForOrigin = true );
+
+ @interface wxUIButton : UIButton
+ {
+ }
+
+ @end
+
+ void WXDLLIMPEXP_CORE wxOSXIPhoneClassAddWXMethods(Class c);
+
+#endif
+
#endif // wxUSE_GUI
#endif
#include "wx/osx/private.h"
-#include "wx/event.h"
-#include "wx/nonownedwnd.h"
-#include "wx/frame.h"
+#ifndef WX_PRECOMP
+ #include "wx/nonownedwnd.h"
+ #include "wx/frame.h"
+ #include "wx/event.h"
+ #include "wx/log.h"
+#endif
+
+#include <objc/objc-runtime.h>
+
+
+WXWidget wxWidgetImpl::FindFocus()
+{
+ UIView* focusedView = nil;
+ UIWindow* keyWindow = [[UIApplication sharedApplication] keyWindow];
+ if ( keyWindow != nil )
+ {
+ /*
+ NSResponder* responder = [keyWindow firstResponder];
+ if ( [responder isKindOfClass:[NSTextView class]] &&
+ [keyWindow fieldEditor:NO forObject:nil] != nil )
+ {
+ focusedView = [(NSTextView*)responder delegate];
+ }
+ else
+ {
+ if ( [responder isKindOfClass:[NSView class]] )
+ focusedView = (NSView*) responder;
+ }
+ */
+ }
+ return focusedView;
+}
+
+CGRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
+{
+ int x, y, w, h ;
+
+ window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;
+ wxRect bounds(x,y,w,h);
+ UIView* sv = (window->GetParent()->GetHandle() );
+
+ return wxToNSRect( sv, bounds );
+}
@interface wxUIView : UIView
{
- wxWidgetImpl* ;
}
+@end // wxUIView
+
+@interface wxUIView(PossibleMethods)
+- (void)setTitle:(NSString *)title forState:(UIControlState)state;
+
- (void)drawRect: (CGRect) rect;
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event;
- (void)handleTouchEvent:(NSSet *)touches withEvent:(UIEvent *)event;
-- (void)setImplementation: (wxWidgetImpl *) theImplementation;
-- (wxWidgetImpl*) implementation;
-- (BOOL) isFlipped;
- (BOOL) becomeFirstResponder;
- (BOOL) resignFirstResponder;
-
-@end // wxUIView
+@end
@interface wxUIContentView : wxUIView
{
@implementation wxUIView
-- (id) initWithFrame: (CGRect) frame
++ (void)initialize
{
- if ( self = [super initWithFrame:frame])
+ static BOOL initialized = NO;
+ if (!initialized)
{
- // additional inits
+ initialized = YES;
+ wxOSXIPhoneClassAddWXMethods( self );
}
- return self;
}
-- (void) dealloc
-{
- // additional deallocs
- [super dealloc];
-}
+@end // wxUIView
+/*
- (void)drawRect: (CGRect) rect
{
- if ( )
+ wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+ if ( impl )
{
CGContextRef context = (CGContextRef) UIGraphicsGetCurrentContext();
CGContextSaveGState( context );
// draw background
- CGContextSetFillColorWithColor( context, ->GetWXPeer()->GetBackgroundColour().GetCGColor());
+ CGContextSetFillColorWithColor( context, impl->GetWXPeer()->GetBackgroundColour().GetCGColor());
CGContextFillRect(context, rect );
- if ( [ self isFlipped ] == NO )
- {
- CGContextTranslateCTM( context, 0, [self bounds].size.height );
- CGContextScaleCTM( context, 1, -1 );
- }
-
- ->GetWXPeer()->MacSetCGContextRef( context );
+ impl->GetWXPeer()->MacSetCGContextRef( context );
- ->GetWXPeer()->GetUpdateRegion() =
+ impl->GetWXPeer()->GetUpdateRegion() =
wxRegion(rect.origin.x,rect.origin.y,rect.size.width,rect.size.height) ;
wxPaintEvent event;
event.SetTimestamp(0); // todo
- event.SetEventObject(->GetWXPeer());
- ->GetWXPeer()->HandleWindowEvent(event);
+ event.SetEventObject(impl->GetWXPeer());
+ impl->GetWXPeer()->HandleWindowEvent(event);
CGContextRestoreGState( context );
}
-(void)handleTouchEvent:(NSSet *)touches withEvent:(UIEvent *)event
{
+ wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
CGPoint clickLocation;
UITouch *touch = [touches anyObject];
clickLocation = [touch locationInView:self];
SetupMouseEvent( wxevent , touches, event ) ;
wxevent.m_x = clickLocation.x;
wxevent.m_y = clickLocation.y;
- wxevent.SetEventObject( ->GetWXPeer() ) ;
- wxevent.SetId( ->GetWXPeer()->GetId() ) ;
- ->GetWXPeer()->HandleWindowEvent(wxevent);
+ wxevent.SetEventObject( impl->GetWXPeer() ) ;
+ wxevent.SetId( impl->GetWXPeer()->GetId() ) ;
+ impl->GetWXPeer()->HandleWindowEvent(wxevent);
}
-- (void)setImplementation: (wxWidgetImpl *) theImplementation
-{
- = theImplementation;
-}
+*/
-- (wxWidgetImpl*) implementation
+void wxOSX_touchEvent(UIView* self, SEL _cmd, NSSet* touches, UIEvent *event )
{
- return ;
+ wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+ if (impl == NULL)
+ return;
+
+ impl->touchEvent(touches, event, self, _cmd);
}
-- (BOOL) isFlipped
+BOOL wxOSX_becomeFirstResponder(UIView* self, SEL _cmd)
{
- return YES;
+ wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+ if (impl == NULL)
+ return NO;
+
+ return impl->becomeFirstResponder(self, _cmd);
}
-- (BOOL) becomeFirstResponder
+BOOL wxOSX_resignFirstResponder(UIView* self, SEL _cmd)
{
- BOOL r = [super becomeFirstResponder];
- if ( r )
- {
- }
- return r;
+ wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+ if (impl == NULL)
+ return NO;
+
+ return impl->resignFirstResponder(self, _cmd);
}
-- (BOOL) resignFirstResponder
+void wxOSX_drawRect(UIView* self, SEL _cmd, CGRect rect)
{
- BOOL r = [super resignFirstResponder];
- if ( r )
- {
- }
- return r;
+ wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+ if (impl == NULL)
+ return;
+
+ return impl->drawRect(&rect, self, _cmd);
}
-@end // wxUIView
+void wxOSXIPhoneClassAddWXMethods(Class c)
+{
+ class_addMethod(c, @selector(touchesBegan:withEvent:), (IMP) wxOSX_touchEvent, "v@:@@");
+ class_addMethod(c, @selector(touchesMoved:withEvent:), (IMP) wxOSX_touchEvent, "v@:@@");
+ class_addMethod(c, @selector(touchesEnded:withEvent:), (IMP) wxOSX_touchEvent, "v@:@@");
+ class_addMethod(c, @selector(becomeFirstResponder), (IMP) wxOSX_becomeFirstResponder, "c@:" );
+ class_addMethod(c, @selector(resignFirstResponder), (IMP) wxOSX_resignFirstResponder, "c@:" );
+ class_addMethod(c, @selector(drawRect:), (IMP) wxOSX_drawRect, "v@:{_CGRect={_CGPoint=ff}{_CGSize=ff}}" );
+}
@implementation wxUIContentView
wxWidgetIPhoneImpl::~wxWidgetIPhoneImpl()
{
- [m_osxView setImplementation:NULL];
+ RemoveAssociations( this );
+
+ if ( !IsRootControl() )
+ {
+ UIView *sv = [m_osxView superview];
+ if ( sv != nil )
+ [m_osxView removeFromSuperview];
+ }
[m_osxView release];
}
bool wxWidgetIPhoneImpl::IsVisible() const
{
- // TODO Superviews
+ // TODO reflect Superviews state
return [m_osxView isHidden] == NO;
}
void wxWidgetIPhoneImpl::ScrollRect( const wxRect *rect, int dx, int dy )
{
+ SetNeedsDisplay() ;
}
void wxWidgetIPhoneImpl::Move(int x, int y, int width, int height)
// m_osxView.backgroundColor = [[UIColor alloc] initWithCGColor:col.GetCGColor()];
}
+void wxWidgetIPhoneImpl::SetLabel(const wxString& title, wxFontEncoding encoding)
+{
+ if ( [m_osxView respondsToSelector:@selector(setTitle:forState:) ] )
+ {
+ wxCFStringRef cf( title , encoding );
+ [m_osxView setTitle:cf.AsNSString() forState:UIControlStateNormal ];
+ }
+ else if ( [m_osxView respondsToSelector:@selector(setStringValue:) ] )
+ {
+ wxCFStringRef cf( title , encoding );
+ [m_osxView setStringValue:cf.AsNSString()];
+ }
+}
+
+
+void wxWidgetIPhoneImpl::SetCursor( const wxCursor & cursor )
+{
+}
+
+void wxWidgetIPhoneImpl::CaptureMouse()
+{
+}
+
+void wxWidgetIPhoneImpl::ReleaseMouse()
+{
+}
+
+wxInt32 wxWidgetIPhoneImpl::GetValue() const
+{
+}
+
+void wxWidgetIPhoneImpl::SetValue( wxInt32 v )
+{
+}
+
+void wxWidgetIPhoneImpl::SetBitmap( const wxBitmap& bitmap )
+{
+}
+
+void wxWidgetIPhoneImpl::SetupTabs( const wxNotebook ¬ebook )
+{
+}
+
+void wxWidgetIPhoneImpl::GetBestRect( wxRect *r ) const
+{
+ r->x = r->y = r->width = r->height = 0;
+
+ if ( [m_osxView respondsToSelector:@selector(sizeToFit)] )
+ {
+ CGRect former = [m_osxView frame];
+ [m_osxView sizeToFit];
+ CGRect best = [m_osxView frame];
+ [m_osxView setFrame:former];
+ r->width = best.size.width;
+ r->height = best.size.height;
+ }
+}
+
+bool wxWidgetIPhoneImpl::IsEnabled() const
+{
+}
+
+void wxWidgetIPhoneImpl::Enable( bool enable )
+{
+}
+
+void wxWidgetIPhoneImpl::SetMinimum( wxInt32 v )
+{
+}
+
+void wxWidgetIPhoneImpl::SetMaximum( wxInt32 v )
+{
+}
+
+wxInt32 wxWidgetIPhoneImpl::GetMinimum() const
+{
+}
+
+wxInt32 wxWidgetIPhoneImpl::GetMaximum() const
+{
+}
+
+void wxWidgetIPhoneImpl::PulseGauge()
+{
+}
+
+void wxWidgetIPhoneImpl::SetScrollThumb( wxInt32 value, wxInt32 thumbSize )
+{
+}
+
+void wxWidgetIPhoneImpl::SetControlSize( wxWindowVariant variant )
+{
+}
+
+void wxWidgetIPhoneImpl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack )
+{
+}
+
+void wxWidgetIPhoneImpl::InstallEventHandler( WXWidget control )
+{
+ WXWidget c = control ? control : (WXWidget) m_osxView;
+ wxWidgetImpl::Associate( c, this ) ;
+
+ if ([c isKindOfClass:[UIControl class] ])
+ {
+ UIControl* cc = (UIControl*) c;
+ /*
+ [cc addTarget:self action:@selector(touchUpInsideAction:event:) forControlEvents:UIControlEventTouchUpInside];
+ */
+ }
+}
+
+void wxWidgetIPhoneImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow)
+{
+ wxWindow* thisWindow = GetWXPeer();
+ if ( thisWindow->MacGetTopLevelWindow() && NeedsFocusRect() )
+ {
+ thisWindow->MacInvalidateBorders();
+ }
+
+ if ( receivedFocus )
+ {
+ wxLogTrace(_T("Focus"), _T("focus set(%p)"), static_cast<void*>(thisWindow));
+ wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
+ thisWindow->HandleWindowEvent(eventFocus);
+
+#if wxUSE_CARET
+ if ( thisWindow->GetCaret() )
+ thisWindow->GetCaret()->OnSetFocus();
+#endif
+
+ wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ if (otherWindow)
+ event.SetWindow(otherWindow->GetWXPeer());
+ thisWindow->HandleWindowEvent(event) ;
+ }
+ else // !receivedFocuss
+ {
+#if wxUSE_CARET
+ if ( thisWindow->GetCaret() )
+ thisWindow->GetCaret()->OnKillFocus();
+#endif
+
+ wxLogTrace(_T("Focus"), _T("focus lost(%p)"), static_cast<void*>(thisWindow));
+
+ wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ if (otherWindow)
+ event.SetWindow(otherWindow->GetWXPeer());
+ thisWindow->HandleWindowEvent(event) ;
+ }
+}
+
+typedef void (*wxOSX_DrawRectHandlerPtr)(UIView* self, SEL _cmd, CGRect rect);
+typedef BOOL (*wxOSX_FocusHandlerPtr)(UIView* self, SEL _cmd);
+
+bool wxWidgetIPhoneImpl::becomeFirstResponder(WXWidget slf, void *_cmd)
+{
+ wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+ // get the current focus before running becomeFirstResponder
+ UIView* otherView = FindFocus();
+ wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
+ BOOL r = superimpl(slf, (SEL)_cmd);
+ if ( r )
+ {
+ DoNotifyFocusEvent( true, otherWindow );
+ }
+ return r;
+}
+
+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
+ 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
+ if ( r && otherWindow != this)
+ {
+ DoNotifyFocusEvent( false, otherWindow );
+ }
+ return r;
+}
+
+void wxWidgetIPhoneImpl::drawRect(CGRect* rect, WXWidget slf, void *WXUNUSED(_cmd))
+{
+ CGContextRef context = (CGContextRef) UIGraphicsGetCurrentContext();
+ CGContextSaveGState( context );
+ // draw background
+
+ CGContextSetFillColorWithColor( context, GetWXPeer()->GetBackgroundColour().GetCGColor());
+ CGContextFillRect(context, *rect );
+
+ GetWXPeer()->MacSetCGContextRef( context );
+
+ GetWXPeer()->GetUpdateRegion() =
+ wxRegion(rect->origin.x,rect->origin.y,rect->size.width,rect->size.height) ;
+
+ wxRegion updateRgn( wxFromNSRect( slf, *rect ) );
+
+ wxWindow* wxpeer = GetWXPeer();
+ wxpeer->GetUpdateRegion() = updateRgn;
+ wxpeer->MacSetCGContextRef( context );
+
+ bool handled = wxpeer->MacDoRedraw( 0 );
+
+ CGContextRestoreGState( context );
+
+ CGContextSaveGState( context );
+ if ( !handled )
+ {
+ // call super
+ SEL _cmd = @selector(drawRect:);
+ wxOSX_DrawRectHandlerPtr superimpl = (wxOSX_DrawRectHandlerPtr) [[slf superclass] instanceMethodForSelector:_cmd];
+ superimpl(slf, _cmd, *rect);
+ CGContextRestoreGState( context );
+ CGContextSaveGState( context );
+ }
+ wxpeer->MacPaintChildrenBorders();
+ wxpeer->MacSetCGContextRef( NULL );
+
+ CGContextRestoreGState( context );
+}
+
+void wxWidgetIPhoneImpl::touchEvent(NSSet* touches, UIEvent *event, WXWidget slf, void *WXUNUSED(_cmd))
+{
+ CGPoint clickLocation;
+ 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() ) ;
+
+ GetWXPeer()->HandleWindowEvent(wxevent);
+}
+
+void wxWidgetIPhoneImpl::touchUpInsideAction(void* sender, WX_UIEvent evt, WXWidget slf, void* _cmd)
+{
+}
+
//
// Factory methods
//
-wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, const wxPoint& pos, const wxSize& size,
- long style, long extraStyle)
+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() );
sv.clipsToBounds = YES;
sv.contentMode = UIViewContentModeRedraw;
sv.clearsContextBeforeDrawing = NO;
- // sv.backgroundColor = [[UIColor alloc] initWithCGColor:wxpeer->GetBackgroundColour().GetCGColor()];
- [sv addSubview:v];
wxWidgetIPhoneImpl* c = new wxWidgetIPhoneImpl( wxpeer, v );
- [v setImplementation:c];
return c;
}
}
*/
wxWidgetIPhoneImpl* impl = new wxWidgetIPhoneImpl( now, contentview, true );
- [contentview setImplementation:impl];
+ impl->InstallEventHandler();
[toplevelwindow addSubview:contentview];
return impl;
}
projects / wxWidgets.git / commitdiff
