X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9479081dfcba1157a5a0a14610940b982362368..d6906a06a24cf6dd081f1bc955c3255765a0b845:/include/wx/mac/carbon/private.h diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h index 19d4470e57..11605d0727 100644 --- a/include/wx/mac/carbon/private.h +++ b/include/wx/mac/carbon/private.h @@ -29,88 +29,10 @@ typedef SInt32 SRefCon; #if wxUSE_GUI #include "wx/listbox.h" +#include "wx/mac/carbon/dc.h" +#include "wx/mac/carbon/dcclient.h" +#include "wx/mac/carbon/dcmemory.h" -#ifndef __LP64__ - -class wxMacPortStateHelper -{ - DECLARE_NO_COPY_CLASS(wxMacPortStateHelper) - -public: - wxMacPortStateHelper( GrafPtr newport); - wxMacPortStateHelper(); - ~wxMacPortStateHelper(); - - void Setup( GrafPtr newport ); - void Clear(); - bool IsCleared() { return m_clip == NULL; } - GrafPtr GetCurrentPort() { return m_currentPort; } - -private: - GrafPtr m_currentPort; - GrafPtr m_oldPort; - RgnHandle m_clip; - ThemeDrawingState m_drawingState; - short m_textFont; - short m_textSize; - short m_textStyle; - short m_textMode; -}; - -class WXDLLEXPORT wxMacPortSaver -{ - DECLARE_NO_COPY_CLASS(wxMacPortSaver) - -public: - wxMacPortSaver( GrafPtr port ); - ~wxMacPortSaver(); -private : - GrafPtr m_port; -}; - -class WXDLLEXPORT wxMacPortSetter -{ - DECLARE_NO_COPY_CLASS(wxMacPortSetter) - -public: - wxMacPortSetter( const wxDC* dc ); - ~wxMacPortSetter(); -private: - wxMacPortStateHelper m_ph; - const wxDC* m_dc; -}; - -/* - Clips to the visible region of a control within the current port - */ - -class WXDLLEXPORT wxMacWindowClipper : public wxMacPortSaver -{ - DECLARE_NO_COPY_CLASS(wxMacWindowClipper) - -public: - wxMacWindowClipper( const wxWindow* win ); - ~wxMacWindowClipper(); -private: - GrafPtr m_newPort; - RgnHandle m_formerClip; - RgnHandle m_newClip; -}; - -class WXDLLEXPORT wxMacWindowStateSaver : public wxMacWindowClipper -{ - DECLARE_NO_COPY_CLASS(wxMacWindowStateSaver) - -public: - wxMacWindowStateSaver( const wxWindow* win ); - ~wxMacWindowStateSaver(); -private: - GrafPtr m_newPort; - ThemeDrawingState m_themeDrawingState; -}; -#endif - -#if wxMAC_USE_CORE_GRAPHICS class WXDLLEXPORT wxMacCGContextStateSaver { DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver) @@ -129,32 +51,11 @@ private: CGContextRef m_cg; }; -#endif -/* -class wxMacDrawingHelper -{ - DECLARE_NO_COPY_CLASS(wxMacDrawingHelper) - -public: - wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ); - ~wxMacDrawingHelper(); - bool Ok() const { return IsOk(); } - bool IsOk() { return m_ok; } - void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ); } - void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ); } - void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ); } - const Point& GetOrigin() { return m_origin; } -private: - Point m_origin; - GrafPtr m_formerPort; - GrafPtr m_currentPort; - PenState m_savedPenState; - bool m_ok; -}; -*/ - // app.h + +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec); +#endif #endif // wxUSE_GUI @@ -340,60 +241,6 @@ private : typedef wxMacUPP wxMacNMUPP; -template class wxMacCFRefHolder -{ -public : - wxMacCFRefHolder() - : m_ref(NULL) , m_release(false) - { - } - - wxMacCFRefHolder( refType ref , bool release = true ) - : m_ref(ref) , m_release(release) - { - } - - ~wxMacCFRefHolder() - { - Release(); - } - - void Release() - { - if ( m_release && m_ref != NULL ) - CFRelease( m_ref ); - m_ref = NULL; - } - - refType Detach() - { - refType val = m_ref; - m_release = false; - m_ref = NULL; - return val; - } - - void Set( refType ref , bool release = true ) - { - Release(); - m_release = release; - m_ref = ref; - } - - operator refType () const { return m_ref; } - - wxMacCFRefHolder& operator=(refType r) - { - Set( r ); - return *this; - } -private : - refType m_ref; - bool m_release; - - DECLARE_NO_COPY_CLASS( wxMacCFRefHolder ) -}; - #if wxUSE_GUI class wxMacToolTipTimer ; @@ -425,22 +272,20 @@ private : #if wxUSE_TIMER wxMacToolTipTimer* m_timer ; #endif - wxMacCFStringHolder m_helpTextRef ; + wxCFStringRef m_helpTextRef ; } ; -/* -GWorldPtr wxMacCreateGWorld( int width , int height , int depth ); -void wxMacDestroyGWorld( GWorldPtr gw ); -PicHandle wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ); -CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize ); -void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue ); -CTabHandle wxMacCreateColorTable( int numColors ); -*/ -void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 ); -void wxMacReleaseBitmapButton( ControlButtonContentInfo*info ); -CGImageRef wxMacCreateCGImageFromBitmap( const wxBitmap& bitmap ); - -#define MAC_WXCOLORREF(a) (*((RGBColor*)&(a))) +// Quartz + +WXDLLIMPEXP_CORE void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 ); +WXDLLIMPEXP_CORE void wxMacReleaseBitmapButton( ControlButtonContentInfo*info ); +WXDLLIMPEXP_CORE CGImageRef wxMacCreateCGImageFromBitmap( const wxBitmap& bitmap ); + +WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithCFData( CFDataRef data ); +WXDLLIMPEXP_CORE CGDataConsumerRef wxMacCGDataConsumerCreateWithCFData( CFMutableDataRef data ); +WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf ); + + #define MAC_WXHBITMAP(a) (GWorldPtr(a)) #define MAC_WXHMETAFILE(a) (PicHandle(a)) #define MAC_WXHICON(a) (IconRef(a)) @@ -478,6 +323,14 @@ WXDLLIMPEXP_CORE Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint ControlActionUPP GetwxMacLiveScrollbarActionProc(); +// additional optional event defines + +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 +enum { + kEventControlFocusPartChanged = 164 +}; +#endif + class wxMacControl : public wxObject { public : @@ -589,7 +442,7 @@ public : virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ); - virtual void SetBackground( const wxBrush &brush ); + virtual void SetBackgroundColour( const wxColour& col ); virtual ControlPartCode HandleKey( SInt16 keyCode, SInt16 charCode, EventModifiers modifiers ); void SetActionProc( ControlActionUPP actionProc ); void SetViewSize( SInt32 viewSize ); @@ -874,7 +727,7 @@ public : protected : wxString m_label; - wxMacCFStringHolder m_cfLabel; + wxCFStringRef m_cfLabel; void * m_data; SInt32 m_order; DataBrowserPropertyID m_colId; @@ -1075,215 +928,16 @@ public: // graphics implementation // ============================================================================ -// make sure we all use one class for all conversions from wx to native colour +// draw the image 'upside down' corrected as HIViewDrawCGImage does -class wxMacCoreGraphicsColour -{ -public: - wxMacCoreGraphicsColour(); - wxMacCoreGraphicsColour(const wxBrush &brush); - ~wxMacCoreGraphicsColour(); - - void Apply( CGContextRef cgContext ); -protected: - void Init(); - wxMacCFRefHolder m_color; - wxMacCFRefHolder m_colorSpace; - - bool m_isPattern; - wxMacCFRefHolder m_pattern; - CGFloat* m_patternColorComponents; -} ; - -#if wxMAC_USE_CORE_GRAPHICS && !wxUSE_GRAPHICS_CONTEXT - -class WXDLLEXPORT wxMacCGPath : public wxGraphicPath -{ - DECLARE_NO_COPY_CLASS(wxMacCGPath) -public : - wxMacCGPath(); - ~wxMacCGPath(); +OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage( + CGContextRef inContext, + const HIRect * inBounds, + CGImageRef inImage) ; - // Starts a new subpath at - void MoveToPoint( wxCoord x1 , wxCoord y1 ); - void AddLineToPoint( wxCoord x1 , wxCoord y1 ); - void AddQuadCurveToPoint( wxCoord cx1, wxCoord cy1, wxCoord x1, wxCoord y1 ); - void AddRectangle( wxCoord x, wxCoord y, wxCoord w, wxCoord h ); - void AddCircle( wxCoord x, wxCoord y , wxCoord r ); - - // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2) - virtual void AddArcToPoint( wxCoord x1, wxCoord y1 , wxCoord x2, wxCoord y2, wxCoord r ) ; - virtual void AddArc( wxCoord x, wxCoord y, wxCoord r, double startAngle, double endAngle, bool clockwise ) ; - - // closes the current subpath - void CloseSubpath(); - - CGPathRef GetPath() const; -private : - CGMutablePathRef m_path; -}; - -class WXDLLEXPORT wxMacCGContext : public wxGraphicContext -{ - DECLARE_NO_COPY_CLASS(wxMacCGContext) - -public: - wxMacCGContext( CGrafPtr port ); - wxMacCGContext( CGContextRef cgcontext ); - wxMacCGContext(); - virtual ~wxMacCGContext(); - - virtual void Clip( const wxRegion ®ion ); - virtual void StrokePath( const wxGraphicPath *p ); - virtual void DrawPath( const wxGraphicPath *p , int fillStyle = wxWINDING_RULE ); - virtual void FillPath( const wxGraphicPath *p , const wxColor &fillColor , int fillStyle = wxWINDING_RULE ); - - virtual wxGraphicPath* CreatePath(); - virtual void SetPen( const wxPen &pen ) ; - virtual void SetBrush( const wxBrush &brush ); - CGContextRef GetNativeContext(); - void SetNativeContext( CGContextRef cg ); - CGPathDrawingMode GetDrawingMode() const { return m_mode; } - - virtual void Translate( wxCoord dx , wxCoord dy ); - virtual void Scale( wxCoord xScale , wxCoord yScale ); - virtual void DrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, wxCoord w, wxCoord h ); - virtual void DrawIcon( const wxIcon &icon, wxCoord x, wxCoord y, wxCoord w, wxCoord h ); - virtual void PushState(); - virtual void PopState(); - - virtual void DrawText( const wxString &str, wxCoord x, wxCoord y, double angle ) ; - - virtual void GetTextExtent( const wxString &str, wxCoord *width, wxCoord *height, - wxCoord *descent, wxCoord *externalLeading ) const ; - - virtual void GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const ; - - virtual void SetFont( const wxFont &font ) ; - - virtual void SetTextColor( const wxColour &col ) ; -private: - CGContextRef m_cgContext; - CGrafPtr m_qdPort; - CGPathDrawingMode m_mode; - ATSUStyle m_macATSUIStyle ; - wxPen m_pen; - wxBrush m_brush; - wxColor m_textForegroundColor ; -}; +CGColorRef WXDLLIMPEXP_CORE wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ; -#endif // wxMAC_USE_CORE_GRAPHICS - -CGColorSpaceRef wxMacGetGenericRGBColorSpace(void); -void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size); - -class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData -{ - friend class WXDLLIMPEXP_FWD_CORE wxIcon; - friend class WXDLLIMPEXP_FWD_CORE wxCursor; -public: - wxBitmapRefData(int width , int height , int depth); - wxBitmapRefData(); - wxBitmapRefData(const wxBitmapRefData &tocopy); - - virtual ~wxBitmapRefData(); - - void Free(); - bool Ok() const { return IsOk(); } - bool IsOk() const { return m_ok; } - void SetOk( bool isOk) { m_ok = isOk; } - - void SetWidth( int width ) { m_width = width; } - void SetHeight( int height ) { m_height = height; } - void SetDepth( int depth ) { m_depth = depth; } - - int GetWidth() const { return m_width; } - int GetHeight() const { return m_height; } - int GetDepth() const { return m_depth; } - - void *GetRawAccess() const; - void *BeginRawAccess(); - void EndRawAccess(); - - bool HasAlpha() const { return m_hasAlpha; } - void UseAlpha( bool useAlpha ); - -public: -#if wxUSE_PALETTE - wxPalette m_bitmapPalette; -#endif // wxUSE_PALETTE - - wxMask * m_bitmapMask; // Optional mask - CGImageRef CGImageCreate() const; - - // returns true if the bitmap has a size that - // can be natively transferred into a true icon - // if no is returned GetIconRef will still produce - // an icon but it will be generated via a PICT and - // rescaled to 16 x 16 - bool HasNativeSize(); - - // caller should increase ref count if needed longer - // than the bitmap exists - IconRef GetIconRef(); - - // returns a Pict from the bitmap content - PicHandle GetPictHandle(); -#if wxMAC_USE_CORE_GRAPHICS - CGContextRef GetBitmapContext() const; -#else - GWorldPtr GetHBITMAP(GWorldPtr * mask = NULL ) const; - void UpdateAlphaMask() const; -#endif - int GetBytesPerRow() const { return m_bytesPerRow; } -private : - bool Create(int width , int height , int depth); - void Init(); - - int m_width; - int m_height; - int m_bytesPerRow; - int m_depth; - bool m_hasAlpha; - wxMemoryBuffer m_memBuf; - int m_rawAccessCount; - bool m_ok; - mutable CGImageRef m_cgImageRef; - - IconRef m_iconRef; - PicHandle m_pictHandle; -#if wxMAC_USE_CORE_GRAPHICS - CGContextRef m_hBitmap; -#else - GWorldPtr m_hBitmap; - GWorldPtr m_hMaskBitmap; - wxMemoryBuffer m_maskMemBuf; - int m_maskBytesPerRow; -#endif -}; - -class WXDLLEXPORT wxIconRefData : public wxGDIRefData -{ -public: - wxIconRefData(); - wxIconRefData( WXHICON ); - virtual ~wxIconRefData() { Free(); } - - void Init(); - virtual void Free(); - - void SetWidth( int width ) { m_width = width; } - void SetHeight( int height ) { m_height = height; } - - int GetWidth() const { return m_width; } - int GetHeight() const { return m_height; } - - WXHICON GetHICON() const { return (WXHICON) m_iconRef; } -private : - IconRef m_iconRef; - int m_width; - int m_height; -}; +CGColorSpaceRef WXDLLIMPEXP_CORE wxMacGetGenericRGBColorSpace(void); // toplevel.cpp @@ -1297,23 +951,6 @@ protected : WindowRef m_macWindow ; } ; -#ifndef __LP64__ - -#ifdef WORDS_BIGENDIAN - inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect ) - { - *rect = (**pict).picFrame; - return rect; - } -#else - inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect ) - { - return QDGetPictureBounds( pict , rect ); - } -#endif - -#endif - #endif // wxUSE_GUI #define wxMAC_DEFINE_PROC_GETTER( UPP , x ) \