make DoSetSizeHints protected, remove parameter defaults

[wxWidgets.git] / include / wx / mac / carbon / window.h

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 2ea9b499908a8e60307faf8b57885fd27871e03f..8eb8950e94fb936cbd20826808caef5d80bf044b 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -236,17 +236,6 @@ public:
     wxList&             GetSubcontrols() { return m_subControls; }
     WXEVENTHANDLERREF   MacGetControlEventHandler() { return m_macControlEventHandler ; }
 
     wxList&             GetSubcontrols() { return m_subControls; }
     WXEVENTHANDLERREF   MacGetControlEventHandler() { return m_macControlEventHandler ; }
 

-#ifndef __WXMAC_OSX__
-    virtual void            MacControlUserPaneDrawProc(wxInt16 part) ;
-    virtual wxInt16         MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) ;
-    virtual wxInt16         MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) ;
-    virtual void            MacControlUserPaneIdleProc() ;
-    virtual wxInt16         MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) ;
-    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 CreateControl calls
     //
     // translate wxWidgets coords into ones suitable
     // to be passed to CreateControl calls
     //


@@ -270,10 +259,8 @@ public:
     // the 'true' OS level control for this wxWindow
     wxMacControl*       GetPeer() const { return m_peer ; }
 
     // 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 ; }
     void *              MacGetCGContextRef() { return m_cgContextRef ; }
     void                MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }

-#endif

 
 protected:
     // For controls like radio buttons which are genuinely composite
 
 protected:
     // For controls like radio buttons which are genuinely composite


@@ -285,9 +272,7 @@ protected:
     // the peer object, allowing for cleaner API support
     wxMacControl *       m_peer ;
 
     // the peer object, allowing for cleaner API support
     wxMacControl *       m_peer ;
 

-#if wxMAC_USE_CORE_GRAPHICS

     void *              m_cgContextRef ;
     void *              m_cgContextRef ;

-#endif

 
     // cache the clipped rectangles within the window hierarchy
     void                MacUpdateClippedRects() const ;
 
     // cache the clipped rectangles within the window hierarchy
     void                MacUpdateClippedRects() const ;