X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed8a08522136bb2b726b79b72dd578228f6ad120..555f645a40d21b575f6154e484e2cddcb950a341:/include/wx/mac/carbon/window.h

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 1867a32c8f..9b5e20c9cb 100644
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -26,6 +26,10 @@ class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxScrollBar;
 class WXDLLEXPORT wxTopLevelWindowMac;
 
+// internal implementation classes
+
+class wxMacControl ;
+
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
@@ -39,19 +43,14 @@ class WXDLLEXPORT wxWindowMac: public wxWindowBase
     
 public:
     
-    wxWindowMac()
-    { Init(); }
+    wxWindowMac() ;
 
     wxWindowMac(wxWindowMac *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr)
-    {
-        Init();
-        Create(parent, id, pos, size, style, name);
-    }
+                const wxString& name = wxPanelNameStr) ;
 
     virtual ~wxWindowMac();
 
@@ -131,7 +130,7 @@ public:
     // simple accessors
     // ----------------
 
-    virtual WXWidget GetHandle() const { return m_macControl ; }
+    virtual WXWidget GetHandle() const ;
 
 #if WXWIN_COMPATIBILITY_2_4
     bool GetTransparentBackground() const { return m_backgroundTransparent; }
@@ -182,6 +181,7 @@ public:
     // the absolute coortinates of this window's root have changed
     virtual void        MacTopLevelWindowChangedPosition() ;
     
+    virtual void        MacChildAdded() ;
     virtual void        MacVisibilityChanged() ;
     virtual void        MacEnabledStateChanged() ;
     virtual void        MacHiliteChanged() ;
@@ -196,17 +196,22 @@ public:
     virtual void        Update() ;
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
         
-    virtual void        MacSetBackgroundBrush( const wxBrush &brush ) { m_macBackgroundBrush = brush ; }
+    virtual void        MacSetBackgroundBrush( const wxBrush &brush ) ;
     const wxBrush&      MacGetBackgroundBrush() const { return m_macBackgroundBrush ; }
     
     // returns the visible region of this control in window ie non-client coordinates
     
     wxRegion            MacGetVisibleRegion( bool includeOuterStructures = false ) ;
+    // returns true if children have to clipped to the content area (eg scrolled window)
+    virtual bool		MacClipChildren() const { return false ; }
+    // returns true if the grandchildren have to be clipped to the children's content area (eg
+    // splitter window)
+    virtual bool		MacClipGrandChildren() const { return false ; }
     bool                MacIsWindowScrollbar( const wxScrollBar* sb )
         { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
 
     wxList&             GetSubcontrols() { return m_subControls; }
-    virtual void		MacInstallEventHandler() ;
+    virtual void		MacInstallEventHandler(WXWidget native) ;
 	virtual void		MacRedrawControl();
     WXEVENTHANDLERREF   MacGetControlEventHandler() { return m_macControlEventHandler ; }
     void                MacPostControlCreate(const wxPoint& pos, const wxSize& size) ;
@@ -220,7 +225,7 @@ public:
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;
 
-    // translate wxWindows coords into ones suitable to be passed to
+    // translate wxWidgets coords into ones suitable to be passed to
     // the CreateControl calls
     //
     // returns TRUE if non default coords are returned, FALSE otherwise
@@ -234,13 +239,16 @@ public:
     // gets the inset from every part
     virtual void        MacGetContentAreaInset( int &left , int &top , int &right , int &bottom ) ;
 
+    // flash the current invalid area, useful for debugging in OSX double buffered situation
+    void                MacFlashInvalidAreas() ;
+
 protected:
     // For controls like radiobuttons which are really composite
     wxList              m_subControls;
     // number of calls to Freeze() minus number of calls to Thaw()
     unsigned int        m_frozenness;
-    // the true native ControlRef / = HIViewRef on OSX
-    WXWidget            m_macControl ;
+    // the peer object, allowing for cleaner API support
+    wxMacControl*       m_peer ;
     // true if is is not a native control but a wxWindow control
 	bool				m_macIsUserPane ;
     wxBrush             m_macBackgroundBrush ;
@@ -261,7 +269,7 @@ protected:
     void                MacPropagateEnabledStateChanged() ;
     void                MacPropagateHiliteChanged() ;
  
-
+    
 #if WXWIN_COMPATIBILITY_2_4
     bool                 m_backgroundTransparent ;
 #endif