From 4849f027a4c76fe0faaf27f79e4aa39e12bebcd0 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 29 Jul 2008 20:28:21 +0000 Subject: [PATCH] osx regrouping git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/cocoa/private.h | 149 ++++++++++++++++++++++++++++++++ include/wx/osx/iphone/private.h | 129 +++++++++++++++++++++++++++ 2 files changed, 278 insertions(+) create mode 100644 include/wx/osx/cocoa/private.h create mode 100644 include/wx/osx/iphone/private.h diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h new file mode 100644 index 0000000000..80e4b9dbb0 --- /dev/null +++ b/include/wx/osx/cocoa/private.h @@ -0,0 +1,149 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/osx/cocoa/private.h +// Purpose: Private declarations: as this header is only included by +// wxWidgets itself, it may contain identifiers which don't start +// with "wx". +// Author: Stefan Csomor +// Modified by: +// Created: 1998-01-01 +// RCS-ID: $Id: private.h 53819 2008-05-29 14:11:45Z SC $ +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_PRIVATE_COCOA_H_ +#define _WX_PRIVATE_COCOA_H_ + +#include "wx/osx/core/private.h" + +#ifdef __OBJC__ + + #import + + extern NSRect wxToNSRect( NSView* parent, const wxRect& r ); + extern wxRect wxFromNSRect( NSView* parent, const NSRect& rect ); + extern NSPoint wxToNSPoint( NSView* parent, const wxPoint& p ); + extern wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p ); + +#endif // __OBJC__ + +#if wxUSE_GUI + +class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl +{ +public : + wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ; + wxWidgetCocoaImpl() ; + ~wxWidgetCocoaImpl(); + + void Init(); + + virtual bool IsVisible() const ; + + virtual void Raise(); + + virtual void Lower(); + + virtual void ScrollRect( const wxRect *rect, int dx, int dy ); + + virtual WXWidget GetWXWidget() const { return m_osxView; } + + 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 SetNeedsDisplay( const wxRect* where = NULL ); + virtual bool GetNeedsDisplay() const; + + virtual bool CanFocus() const; + // return true if successful + virtual bool SetFocus(); + virtual bool HasFocus() const; + + void RemoveFromParent(); + void Embed( wxWidgetImpl *parent ); +protected: + WXWidget m_osxView; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl) +}; + +class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl +{ +public : + wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ; + wxNonOwnedWindowCocoaImpl(); + + virtual ~wxNonOwnedWindowCocoaImpl(); + + virtual void Destroy() ; + void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, + long style, long extraStyle, const wxString& name ) ; + + WXWindow GetWXWindow() const; + void Raise(); + void Lower(); + bool Show(bool show); + bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout); + + void Update(); + bool SetTransparent(wxByte alpha); + bool SetBackgroundColour(const wxColour& col ); + void SetExtraStyle( long exStyle ); + bool SetBackgroundStyle(wxBackgroundStyle style); + bool CanSetTransparent(); + + void MoveWindow(int x, int y, int width, int height); + void GetPosition( int &x, int &y ) const; + void GetSize( int &width, int &height ) const; + + void GetContentArea( int &left , int &top , int &width , int &height ) const; + bool SetShape(const wxRegion& region); + + virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ; + + virtual bool IsMaximized() const; + + virtual bool IsIconized() const; + + virtual void Iconize( bool iconize ); + + virtual void Maximize(bool maximize); + + virtual bool IsFullScreen() const; + + virtual bool ShowFullScreen(bool show, long style); + + virtual void RequestUserAttention(int flags); + + virtual void ScreenToWindow( int *x, int *y ); + + virtual void WindowToScreen( int *x, int *y ); + + wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } +protected : + WX_NSWindow m_macWindow; + void * m_macFullScreenData ; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl) +}; + +// NSCursor + +WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type ); +WX_NSCursor wxMacCocoaCreateCursorFromCGImage( CGImageRef cgImageRef, float hotSpotX, float hotSpotY ); +void wxMacCocoaSetCursor( WX_NSCursor cursor ); +void wxMacCocoaHideCursor(); +void wxMacCocoaShowCursor(); + +typedef struct tagClassicCursor +{ + wxUint16 bits[16]; + wxUint16 mask[16]; + wxInt16 hotspot[2]; +}ClassicCursor; + +#endif + +#endif + // _WX_PRIVATE_COCOA_H_ + diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h new file mode 100644 index 0000000000..e30519729f --- /dev/null +++ b/include/wx/osx/iphone/private.h @@ -0,0 +1,129 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/osx/iphone/private.h +// Purpose: Private declarations: as this header is only included by +// wxWidgets itself, it may contain identifiers which don't start +// with "wx". +// Author: Stefan Csomor +// Modified by: +// Created: 1998-01-01 +// RCS-ID: $Id: private.h 53819 2008-05-29 14:11:45Z SC $ +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_PRIVATE_IPHONE_H_ +#define _WX_PRIVATE_IPHONE_H_ + +#include "wx/osx/core/private.h" + +#ifdef __OBJC__ + #import +#endif + +#if wxUSE_GUI + +class WXDLLIMPEXP_CORE wxWidgetIPhoneImpl : public wxWidgetImpl +{ +public : + wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ; + wxWidgetIPhoneImpl() ; + ~wxWidgetIPhoneImpl(); + + void Init(); + + virtual bool IsVisible() const ; + virtual void SetVisibility( bool visible ); + + virtual void Raise(); + + virtual void Lower(); + + virtual void ScrollRect( const wxRect *rect, int dx, int dy ); + + virtual WXWidget GetWXWidget() const { return m_osxView; } + + virtual void SetBackgroundColour( const wxColour& col ) ; + + 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 SetNeedsDisplay( const wxRect* where = NULL ); + virtual bool GetNeedsDisplay() const; + + virtual bool CanFocus() const; + // return true if successful + virtual bool SetFocus(); + virtual bool HasFocus() const; + + void RemoveFromParent(); + void Embed( wxWidgetImpl *parent ); +protected: + WXWidget m_osxView; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetIPhoneImpl) +}; + +class wxNonOwnedWindowIPhoneImpl : public wxNonOwnedWindowImpl +{ +public : + wxNonOwnedWindowIPhoneImpl( wxNonOwnedWindow* nonownedwnd) ; + wxNonOwnedWindowIPhoneImpl(); + + virtual ~wxNonOwnedWindowIPhoneImpl(); + + virtual void Destroy() ; + void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, + long style, long extraStyle, const wxString& name ) ; + + WXWindow GetWXWindow() const; + void Raise(); + void Lower(); + bool Show(bool show); + bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout); + + void Update(); + bool SetTransparent(wxByte alpha); + bool SetBackgroundColour(const wxColour& col ); + void SetExtraStyle( long exStyle ); + bool SetBackgroundStyle(wxBackgroundStyle style); + bool CanSetTransparent(); + + void MoveWindow(int x, int y, int width, int height); + void GetPosition( int &x, int &y ) const; + void GetSize( int &width, int &height ) const; + + void GetContentArea( int &left , int &top , int &width , int &height ) const; + bool SetShape(const wxRegion& region); + + virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ; + + virtual bool IsMaximized() const; + + virtual bool IsIconized() const; + + virtual void Iconize( bool iconize ); + + virtual void Maximize(bool maximize); + + virtual bool IsFullScreen() const; + + virtual bool ShowFullScreen(bool show, long style); + + virtual void RequestUserAttention(int flags); + + virtual void ScreenToWindow( int *x, int *y ); + + virtual void WindowToScreen( int *x, int *y ); + + wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } +protected : + WX_UIWindow m_macWindow; + void * m_macFullScreenData ; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowIPhoneImpl) +}; + +#endif // wxUSE_GUI + +#endif + // _WX_PRIVATE_IPHONE_H_ -- 2.45.2