X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b36f53bd13793a2fe63468bc0ab99ab79503695..19e30148e18cc99296b26503c155e5cef59045f4:/include/wx/mac/window.h?ds=sidebyside

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index 572b799431..8ab6a1c366 100644
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -29,16 +29,9 @@ class WXDLLEXPORT wxTopLevelWindowMac;
 // constants
 // ---------------------------------------------------------------------------
 
-// FIXME does anybody use those? they're unused by wxWindows...
-enum
-{
-    wxKEY_SHIFT = 1,
-    wxKEY_CTRL  = 2
-};
-
 class WXDLLEXPORT wxWindowMac: public wxWindowBase
 {
-  DECLARE_DYNAMIC_CLASS(wxWindowMac);
+  DECLARE_DYNAMIC_CLASS(wxWindowMac)
 
   friend class wxDC;
   friend class wxPaintDC;
@@ -81,8 +74,6 @@ public:
     virtual void SetFocus();
 
     virtual void WarpPointer(int x, int y);
-    virtual void CaptureMouse();
-    virtual void ReleaseMouse();
 
     virtual void Refresh( bool eraseBackground = TRUE,
                           const wxRect *rect = (const wxRect *) NULL );
@@ -214,16 +205,18 @@ public:
 
 public :
 	static bool							MacGetWindowFromPoint( const wxPoint &point , wxWindowMac** outWin ) ;
-	virtual	void						MacRedraw( RgnHandle updatergn , long time , bool erase) ;
+	virtual bool						MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ;
+	virtual	void						MacRedraw( WXHRGN updatergn , long time , bool erase) ;
 	virtual bool						MacCanFocus() const { return true ; }
 
 	virtual bool						MacDispatchMouseEvent(wxMouseEvent& event ) ;
-
+	// 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 ) ;
-	WindowRef						    MacGetRootWindow() const  ;
+	WXWindow						    MacGetRootWindow() const  ;
 	wxTopLevelWindowMac*                MacGetTopLevelWindow() const ;
 
-	virtual ControlHandle 				MacGetContainerForEmbedding() ;
+	virtual WXWidget 				    MacGetContainerForEmbedding() ;
 	
 	virtual long						MacGetLeftBorderSize() const ;
 	virtual long						MacGetRightBorderSize() const ;
@@ -240,16 +233,14 @@ public :
 	// for compatibility
 	void                                MacUpdateImmediately() { Update() ; }
 	
-	virtual bool						MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin )  ;
-
-	virtual void						MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ;
-	virtual void						MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindowMac** rootwin) ;
+//	virtual bool						MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin )  ;
+//	virtual void						MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ;
+//	virtual void						MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindowMac** rootwin) ;
 	const wxBrush&                      MacGetBackgroundBrush() ;
     const wxRegion&                     MacGetVisibleRegion() ;
 	bool								MacIsWindowScrollbar( const wxScrollBar* sb ) { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
 	static wxWindowMac*					s_lastMouseWindow ;
 private:
-	virtual bool						MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ;
 protected:
 //	RgnHandle					m_macUpdateRgn ;
 //	bool						m_macEraseOnRedraw ;
@@ -291,6 +282,9 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
+    virtual void DoCaptureMouse();
+    virtual void DoReleaseMouse();
+
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::MoveWindow() except for composite controls which will want to arrange
@@ -309,23 +303,5 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-class wxMacDrawingHelper
-{
-public :
-	wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ;
-	~wxMacDrawingHelper() ;
-	bool Ok() { return m_ok ; }
-	void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ) ; }
-	void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ) ; }
-	void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ) ; }
-  const Point& GetOrigin() { return m_origin ; }
-private :
-  Point     m_origin ;
-	GrafPtr 	m_formerPort ;
-	GrafPtr		m_currentPort ;
-	PenState 	m_savedPenState ;
-	bool			m_ok ;
-} ;
-
 #endif
     // _WX_WINDOW_H_