X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c74e7fe1de14f32dcd6f3c9cdd727de540bbd0e..71499aafed86032f0e8ed874a9007f19b921d206:/include/wx/mac/window.h

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index 3eac7270ce..98bccb0324 100644
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -86,8 +86,6 @@ public:
 
     virtual void SetFocus();
 
-    virtual bool Reparent( wxWindow *newParent );
-
     virtual void WarpPointer(int x, int y);
     virtual void CaptureMouse();
     virtual void ReleaseMouse();
@@ -163,7 +161,8 @@ public:
 
 	void MacClientToRootWindow( int *x , int *y ) const ;
 	void MacRootWindowToClient( int *x , int *y ) const ;
-
+	
+	virtual wxString MacGetToolTipString( wxPoint &where ) ;
 
     // simple accessors
     // ----------------
@@ -181,6 +180,8 @@ public:
     void OnEraseBackground(wxEraseEvent& event);
     void OnIdle(wxIdleEvent& event);
     void MacOnScroll(wxScrollEvent&event ) ;
+    
+    bool AcceptsFocus() const ;
 
 public:
     // For implementation purposes - sometimes decorations make the client area
@@ -219,8 +220,12 @@ public:
 
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
-
 public :
+	virtual void						MacCreateRealWindow( const wxString& title,
+           const wxPoint& pos,
+           const wxSize& size,
+           long style,
+           const wxString& name ) ;
 	static bool							MacGetWindowFromPoint( const wxPoint &point , wxWindow** outWin ) ;
 	virtual void						MacActivate( EventRecord *ev , bool inIsActivating ) ;
 	virtual void						MacUpdate( EventRecord *ev ) ;
@@ -235,21 +240,28 @@ public :
 	virtual void						MacFireMouseEvent( EventRecord *ev ) ;
 	virtual bool						MacDispatchMouseEvent(wxMouseEvent& event ) ;
 	virtual void						MacEraseBackground( Rect *rect ) ;
-	WindowRef								GetMacRootWindow() const  ;
-
-	virtual ControlHandle 	MacGetContainerForEmbedding() ;
+	virtual void 						MacPaintBorders() ;
+	// obsolete : only for link compatibility
+	virtual void 						MacPaint( wxPaintEvent &event ) ;
+	WindowRef							GetMacRootWindow() const  ;
+
+	virtual ControlHandle 				MacGetContainerForEmbedding() ;
+	virtual long						MacGetBorderSize() const ;
+	static long							MacRemoveBordersFromStyle( long style ) ;
 	virtual void 						MacSuperChangedPosition() ;
-
+	virtual void						MacSuperShown( bool show ) ;
+/*
 	bool										MacSetupFocusPort() ;
 	bool										MacSetupDrawingPort() ;
 	bool										MacSetupFocusClientPort() ;
 	bool										MacSetupDrawingClientPort() ;
-	
+*/	
 	virtual bool						MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* rootwin )  ;
 	virtual bool						MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* rootwin )  ;
 
 	virtual void						MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) ;
 	virtual void						MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindow** rootwin) ;
+	virtual void						MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindow** rootwin) ;
 	MacWindowData*						MacGetWindowData() { return m_macWindowData ; }
 	static WindowRef					MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
 	bool								MacIsWindowScrollbar( const wxScrollBar* sb ) { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
@@ -260,6 +272,7 @@ protected:
 
 	MacWindowData*				m_macWindowData ;
 	static WindowRef			s_macWindowInUpdate ;
+	RgnHandle					m_macUpdateRgn ;
 
 	int 									m_x ;
 	int 									m_y ;	
@@ -297,10 +310,6 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
-    // get the size which best suits the window: e.g., for a static text it
-    // will be the width and height of the text
-    virtual wxSize DoGetBestSize();
-
     // 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
@@ -325,6 +334,7 @@ wxWindow* wxFindWinFromMacWindow( WindowRef inWindow ) ;
 void wxAssociateWinWithMacWindow(WindowRef inWindow, wxWindow *win) ;
 void wxRemoveMacWindowAssociation(wxWindow *win) ;
 
+/*
 class wxMacFocusHelper
 {
 public :
@@ -337,6 +347,7 @@ private :
 	GrafPtr		m_currentPort ;
 	bool			m_ok ;
 } ;
+*/
 
 class wxMacDrawingHelper
 {
@@ -351,7 +362,7 @@ private :
 	PenState 	m_savedPenState ;
 	bool			m_ok ;
 } ;
-
+/*
 class wxMacFocusClientHelper
 {
 public :
@@ -364,7 +375,7 @@ private :
 	GrafPtr		m_currentPort ;
 	bool			m_ok ;
 } ;
-
+*/
 class wxMacDrawingClientHelper
 {
 public :