X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08422003083270640e23c2563a5fa72d131add96..478cde3220641d49cfbd492e799107d13ccdfeb3:/include/wx/mac/carbon/window.h

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 9b5e20c9cb..97d3c3cfd7 100644
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/brush.h"
+#include "wx/dc.h"
 
 // ---------------------------------------------------------------------------
 // forward declarations
@@ -81,6 +82,9 @@ public:
     virtual void Freeze() ;
     virtual void Thaw() ;
 
+    virtual void Update() ;
+    virtual void ClearBackground() ;
+
     virtual bool SetCursor( const wxCursor &cursor );
     virtual bool SetFont( const wxFont &font ) ;
     virtual bool SetBackgroundColour( const wxColour &colour );
@@ -140,6 +144,7 @@ public:
     // event handlers
     // --------------
     void OnSetFocus(wxFocusEvent& event) ;
+    void OnPaint(wxPaintEvent& event);
     void OnNcPaint(wxNcPaintEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
     void OnMouseEvent( wxMouseEvent &event ) ;
@@ -161,12 +166,14 @@ public:
 public:
     virtual void        MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
     virtual bool        MacDoRedraw( WXHRGN updatergn , long time ) ;
-    virtual void        MacRedraw( WXHRGN updatergn , long time , bool erase) ;
     virtual bool        MacCanFocus() const ;
     
     // this should not be overriden in classes above wxWindowMac because it is called from its destructor via DeleteChildren
     virtual void        RemoveChild( wxWindowBase *child );
     virtual void        MacPaintBorders( int left , int top ) ;
+    // invalidates the borders and focus area around the control
+    // must not be virtual as it will be called during destruction
+    void                MacInvalidateBorders() ;
     WXWindow            MacGetTopLevelWindowRef() const  ;
     wxTopLevelWindowMac* MacGetTopLevelWindow() const ;
     
@@ -176,7 +183,7 @@ public:
     virtual long        MacGetBottomBorderSize() const ;
     
     static long         MacRemoveBordersFromStyle( long style ) ;
-
+    
     virtual void        MacSuperChangedPosition() ;
     // the absolute coortinates of this window's root have changed
     virtual void        MacTopLevelWindowChangedPosition() ;
@@ -193,7 +200,6 @@ public:
     
     bool		        MacIsUserPane() { return m_macIsUserPane; }
 
-    virtual void        Update() ;
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
         
     virtual void        MacSetBackgroundBrush( const wxBrush &brush ) ;
@@ -212,10 +218,9 @@ public:
 
     wxList&             GetSubcontrols() { return m_subControls; }
     virtual void		MacInstallEventHandler(WXWidget native) ;
-	virtual void		MacRedrawControl();
     WXEVENTHANDLERREF   MacGetControlEventHandler() { return m_macControlEventHandler ; }
     void                MacPostControlCreate(const wxPoint& pos, const wxSize& size) ;
-
+#ifndef __WXMAC_OSX__
     virtual void            MacControlUserPaneDrawProc(wxInt16 part) ;
     virtual wxInt16         MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) ;
     virtual wxInt16         MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) ;
@@ -224,7 +229,7 @@ public:
     virtual void            MacControlUserPaneActivateProc(bool activating) ;
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;
-
+#endif
     // translate wxWidgets coords into ones suitable to be passed to
     // the CreateControl calls
     //
@@ -242,6 +247,12 @@ public:
     // flash the current invalid area, useful for debugging in OSX double buffered situation
     void                MacFlashInvalidAreas() ;
 
+    // the 'true' OS level control for this wxWindow
+    wxMacControl*       GetPeer() const { return m_peer ; }
+#if wxMAC_USE_CORE_GRAPHICS
+    void *              MacGetCGContextRef() { return m_cgContextRef ; }
+    void                MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }
+#endif
 protected:
     // For controls like radiobuttons which are really composite
     wxList              m_subControls;
@@ -249,6 +260,9 @@ protected:
     unsigned int        m_frozenness;
     // the peer object, allowing for cleaner API support
     wxMacControl*       m_peer ;
+#if wxMAC_USE_CORE_GRAPHICS
+    void *              m_cgContextRef ;
+#endif
     // true if is is not a native control but a wxWindow control
 	bool				m_macIsUserPane ;
     wxBrush             m_macBackgroundBrush ;