From 9e55f38df79556665b8f6aa1992cf3733ebf4e93 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 10 Jul 2009 19:19:36 +0000 Subject: [PATCH] adapting to widgetimpl extensions and iPhone OS 3.0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/iphone/private.h | 6 +++++- src/osx/carbon/dcscreen.cpp | 4 ++++ src/osx/cocoa/textctrl.mm | 8 ++++---- src/osx/iphone/window.mm | 10 ++++++++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h index 0782922cb9..252b26c10e 100644 --- a/include/wx/osx/iphone/private.h +++ b/include/wx/osx/iphone/private.h @@ -78,7 +78,11 @@ public : wxInt32 GetValue() const; void SetValue( wxInt32 v ); - void SetBitmap( const wxBitmap& bitmap ); + + virtual wxBitmap GetBitmap() const; + virtual void SetBitmap( const wxBitmap& bitmap ); + virtual void SetBitmapPosition( wxDirection dir ); + void SetupTabs( const wxNotebook ¬ebook ); void GetBestRect( wxRect *r ) const; bool IsEnabled() const; diff --git a/src/osx/carbon/dcscreen.cpp b/src/osx/carbon/dcscreen.cpp index 0777c55d52..9dfcfef870 100644 --- a/src/osx/carbon/dcscreen.cpp +++ b/src/osx/carbon/dcscreen.cpp @@ -30,10 +30,14 @@ IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl) wxScreenDCImpl::wxScreenDCImpl( wxDC *owner ) : wxWindowDCImpl( owner ) { +#if wxOSX_USE_COCOA_OR_CARBON CGRect cgbounds ; cgbounds = CGDisplayBounds(CGMainDisplayID()); m_width = (wxCoord)cgbounds.size.width; m_height = (wxCoord)cgbounds.size.height; +#else + wxDisplaySize( &m_width, &m_height ); +#endif #if wxOSX_USE_COCOA_OR_IPHONE SetGraphicsContext( wxGraphicsContext::Create() ); #else diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm index 2b12dac53b..c9dbe0b1ae 100644 --- a/src/osx/cocoa/textctrl.mm +++ b/src/osx/cocoa/textctrl.mm @@ -141,7 +141,7 @@ protected : - (void) keyDown:(NSEvent*) event { - wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( [self delegate] ); + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] ); lastKeyDownEvent = event; if ( impl == NULL || !impl->DoHandleKeyEvent(event) ) [super keyDown:event]; @@ -150,14 +150,14 @@ protected : - (void) keyUp:(NSEvent*) event { - wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( [self delegate] ); + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] ); if ( impl == NULL || !impl->DoHandleKeyEvent(event) ) [super keyUp:event]; } - (void) flagsChanged:(NSEvent*) event { - wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( [self delegate] ); + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] ); if ( impl == NULL || !impl->DoHandleKeyEvent(event) ) [super flagsChanged:event]; } @@ -170,7 +170,7 @@ protected : - (void) insertText:(id) str { - wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( [self delegate] ); + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] ); if ( impl == NULL || lastKeyDownEvent==nil || !impl->DoHandleCharEvent(lastKeyDownEvent, str) ) { [super insertText:str]; diff --git a/src/osx/iphone/window.mm b/src/osx/iphone/window.mm index 9512048639..154329afb9 100644 --- a/src/osx/iphone/window.mm +++ b/src/osx/iphone/window.mm @@ -519,6 +519,16 @@ void wxWidgetIPhoneImpl::SetBitmap( const wxBitmap& bitmap ) { } +wxBitmap wxWidgetIPhoneImpl::GetBitmap() const +{ + wxBitmap bmp; + return bmp; +} + +void wxWidgetIPhoneImpl::SetBitmapPosition( wxDirection dir ) +{ +} + void wxWidgetIPhoneImpl::SetupTabs( const wxNotebook ¬ebook ) { } -- 2.45.2