mac cleanup, pure cgcolor

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h
index 6f6bbb4ba6256527b197e35814cb10c9bd2062a9..ea482f508900d2fef9d97abd8e1d7af167dec845 100644 (file)
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -18,19 +18,10 @@
 
 class WXDLLIMPEXP_FWD_CORE wxBrush;
 
 
 class WXDLLIMPEXP_FWD_CORE wxBrush;
 

-typedef enum
-{
-    kwxMacBrushColour ,
-    kwxMacBrushTheme ,
-    kwxMacBrushThemeBackground
-} wxMacBrushKind ;
-

 // Brush
 class WXDLLEXPORT wxBrush: public wxBrushBase
 {
 // Brush
 class WXDLLEXPORT wxBrush: public wxBrushBase
 {

-    DECLARE_DYNAMIC_CLASS(wxBrush)
-
-public:
+ public:

     wxBrush();
     wxBrush(short macThemeBrush ) ;
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush();
     wxBrush(short macThemeBrush ) ;
     wxBrush(const wxColour& col, int style = wxSOLID);


@@ -41,31 +32,23 @@ public:
     virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
     virtual void SetStyle(int style)  ;
     virtual void SetStipple(const wxBitmap& stipple)  ;
     virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
     virtual void SetStyle(int style)  ;
     virtual void SetStipple(const wxBitmap& stipple)  ;

-    virtual void MacSetTheme(short macThemeBrush) ;
-// TODO REMOVE    virtual void MacSetThemeBackground(unsigned long macThemeBackground ,  WXRECTPTR extent) ;

 
     bool operator == (const wxBrush& brush) const;
     bool operator != (const wxBrush& brush) const
         { return !(*this == brush); }
 
 
     bool operator == (const wxBrush& brush) const;
     bool operator != (const wxBrush& brush) const
         { return !(*this == brush); }
 

-    wxMacBrushKind MacGetBrushKind()  const ;
-
-// TODO REMOVE    unsigned long MacGetThemeBackground(WXRECTPTR extent)  const ;
-    short MacGetTheme()  const ;
-    wxColour& GetColour() const ;
+    const wxColour& GetColour() const ;

     virtual int GetStyle() const ;
     wxBitmap *GetStipple() const ;
 
     virtual bool Ok() const { return IsOk(); }
     virtual bool IsOk() const { return (m_refData != NULL) ; }
 
     virtual int GetStyle() const ;
     wxBitmap *GetStipple() const ;
 
     virtual bool Ok() const { return IsOk(); }
     virtual bool IsOk() const { return (m_refData != NULL) ; }
 

-// Implementation
-
-    // Useful helper: create the brush resource
-    bool RealizeResource();
-
+protected:
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

 private:
 private:

-    void Unshare();
+    DECLARE_DYNAMIC_CLASS(wxBrush)    

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index d0623889fd6ce0ff49132b14a3d488652d34101d..156e22d81e5977cd81acef3b7fd944d335ac44c0 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -48,6 +48,10 @@ public:
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
     CGColorRef GetPixel() const { return m_cgColour; };
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
     CGColorRef GetPixel() const { return m_cgColour; };

+    
+    CGColorRef GetCGColor() const { return m_cgColour; };
+    CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); };
+    

     void GetRGBColor( RGBColor *col ) const;
 
     // Mac-specific ctor and assignment operator from the native colour
     void GetRGBColor( RGBColor *col ) const;
 
     // Mac-specific ctor and assignment operator from the native colour

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 9b00f047df9d7dab2ff47d1385372357dc9ccf50..ad010e8b0b3c8c422e0c2607d8e0f542c3cced82 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -586,7 +586,7 @@ public :
 
 
     virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle );
 
 
     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 );
     virtual ControlPartCode HandleKey(  SInt16 keyCode,  SInt16 charCode, EventModifiers modifiers );
     void SetActionProc( ControlActionUPP   actionProc );
     void SetViewSize( SInt32 viewSize );


@@ -1079,27 +1079,10 @@ OSStatus WXDLLEXPORT wxMacDrawCGImage(
                                const HIRect *  inBounds,
                                CGImageRef      inImage) ;
 
                                const HIRect *  inBounds,
                                CGImageRef      inImage) ;
 

-// make sure we all use one class for all conversions from wx to native colour
-
-class wxMacCoreGraphicsColour
-{
-public:
-    wxMacCoreGraphicsColour();
-    wxMacCoreGraphicsColour(const wxBrush &brush);
-    ~wxMacCoreGraphicsColour();
-    
-     void Apply( CGContextRef cgContext );
-protected:
-    void Init();
-    wxMacCFRefHolder<CGColorRef> m_color;
-    wxMacCFRefHolder<CGColorSpaceRef> m_colorSpace;
-
-    bool m_isPattern;
-    wxMacCFRefHolder<CGPatternRef> m_pattern;
-    CGFloat* m_patternColorComponents;
-} ;
+CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ;

 
 CGColorSpaceRef wxMacGetGenericRGBColorSpace(void);
 
 CGColorSpaceRef wxMacGetGenericRGBColorSpace(void);

+

 void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size);
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size);
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData


@@ -1213,23 +1196,6 @@ protected :
     WindowRef m_macWindow ;
 } ;
 
     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 ) \
 #endif // wxUSE_GUI
 
 #define wxMAC_DEFINE_PROC_GETTER( UPP , x ) \

diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h
index 759ca4dd36a02dadccdb1e05660d2616378cb5c3..3a2a8eb24b1fbebd90093eb318b2c15f499be3c3 100644 (file)
--- a/include/wx/mac/carbon/toplevel.h
+++ b/include/wx/mac/carbon/toplevel.h
@@ -96,8 +96,8 @@ public:
 
     virtual void SetExtraStyle(long exStyle) ;
 
 
     virtual void SetExtraStyle(long exStyle) ;
 

-    virtual void MacSetBackgroundBrush( const wxBrush &brush ) ;
-
+    virtual bool SetBackgroundColour( const wxColour &colour );
+    

     virtual void MacInstallTopLevelWindowEventHandler() ;
 
     bool MacGetMetalAppearance() const ;
     virtual void MacInstallTopLevelWindowEventHandler() ;
 
     bool MacGetMetalAppearance() const ;

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 8eb8950e94fb936cbd20826808caef5d80bf044b..e9823f386b6c21cb64a811a85e746cb3f94de419 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -202,8 +202,6 @@ public:
     bool                MacIsUserPane() { return m_macIsUserPane; }
 
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
     bool                MacIsUserPane() { return m_macIsUserPane; }
 
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;

-    virtual void        MacSetBackgroundBrush( const wxBrush &brush ) ;
-    const wxBrush&      MacGetBackgroundBrush() const { return m_macBackgroundBrush ; }

 
     // return the rectangle that would be visible of this control,
     // regardless whether controls are hidden
 
     // return the rectangle that would be visible of this control,
     // regardless whether controls are hidden


@@ -287,7 +285,6 @@ protected:
 
     // true if is is not a native control but a wxWindow control
     bool                m_macIsUserPane ;
 
     // true if is is not a native control but a wxWindow control
     bool                m_macIsUserPane ;

-    wxBrush             m_macBackgroundBrush ;

 
     // insets of the mac control from the wx top left corner
     wxPoint             m_macTopLeftInset ;
 
     // insets of the mac control from the wx top left corner
     wxPoint             m_macTopLeftInset ;