X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59d866ad8510b8674e6cc7cdf218c4c0010d3925..f5fac4471b361f54ae6a09f6047ae4dbe30fcb86:/include/wx/osx/iphone/private.h diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h index 0a698a7bbb..a65f3ee2bf 100644 --- a/include/wx/osx/iphone/private.h +++ b/include/wx/osx/iphone/private.h @@ -6,7 +6,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: private.h 53819 2008-05-29 14:11:45Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,8 +14,6 @@ #ifndef _WX_PRIVATE_IPHONE_H_ #define _WX_PRIVATE_IPHONE_H_ -#include "wx/osx/core/private.h" - #ifdef __OBJC__ #import #endif @@ -28,11 +26,12 @@ OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage( CGImageRef inImage) ; WX_UIImage WXDLLIMPEXP_CORE wxOSXGetUIImageFromCGImage( CGImageRef image ); +wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxString &client, const wxSize& size); class WXDLLIMPEXP_CORE wxWidgetIPhoneImpl : public wxWidgetImpl { public : - wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ; + wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ; wxWidgetIPhoneImpl() ; ~wxWidgetIPhoneImpl(); @@ -50,13 +49,15 @@ public : virtual WXWidget GetWXWidget() const { return m_osxView; } virtual void SetBackgroundColour( const wxColour& col ) ; + virtual bool SetBackgroundStyle(wxBackgroundStyle style) ; virtual void GetContentArea( int &left , int &top , int &width , int &height ) const; 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 float GetContentScaleFactor() const ; + virtual void SetNeedsDisplay( const wxRect* where = NULL ); virtual bool GetNeedsDisplay() const; @@ -110,8 +111,8 @@ public : // action - virtual void touchUpInsideAction(void* sender, WX_UIEvent evt, WXWidget slf, void* _cmd); - + virtual void controlAction(void* sender, wxUint32 controlEvent, WX_UIEvent rawEvent); + virtual void controlTextDidChange(); protected: WXWidget m_osxView; DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetIPhoneImpl) @@ -128,6 +129,7 @@ public : virtual void WillBeDestroyed() ; void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, long style, long extraStyle, const wxString& name ) ; + void Create( wxWindow* parent, WXWindow nativeWindow ); WXWindow GetWXWindow() const; void Raise(); @@ -171,7 +173,7 @@ public : // FIXME: Does iPhone have a concept of inactive windows? virtual bool IsActive() { return true; } - + wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } virtual bool InitialShowEventSent() { return m_initialShowSent; } @@ -204,6 +206,7 @@ protected : @end // wxUIView + void WXDLLIMPEXP_CORE wxOSXIPhoneClassAddWXMethods(Class c); #endif