X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/997e843d51ab9776a2f727a33656253dc6ab0bbf..a29b55cdf6c1f8547c615a5e928813ba78566e9a:/include/wx/mac/carbon/window.h

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index c2c0326e58..01b5e495d4 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
 // ---------------------------------------------------------------------------
@@ -126,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; }
@@ -191,7 +195,7 @@ 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
@@ -201,7 +205,7 @@ public:
         { 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) ;
@@ -237,8 +241,8 @@ protected:
     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 ;