X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..9739d9ee8090965862ba623b09a8fba731dc3d5c:/include/wx/mac/window.h?ds=sidebyside

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index 7c4bb6b097..3eac7270ce 100644
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -21,6 +21,7 @@
 // ---------------------------------------------------------------------------
 
 class WXDLLEXPORT wxButton;
+class WXDLLEXPORT wxScrollBar;
 
 // ---------------------------------------------------------------------------
 // constants
@@ -154,8 +155,6 @@ public:
 
     // Native resource loading (implemented in src/msw/nativdlg.cpp)
     // FIXME: should they really be all virtual?
-    virtual bool LoadNativeDialog(wxWindow* parent, wxWindowID& id);
-    virtual bool LoadNativeDialog(wxWindow* parent, const wxString& name);
     wxWindow* GetWindowChild1(wxWindowID id);
     wxWindow* GetWindowChild(wxWindowID id);
 
@@ -169,9 +168,9 @@ public:
     // simple accessors
     // ----------------
 
-    WXHWND GetHWND() const { return m_hWnd; }
-    void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; }
-	virtual WXWidget GetHandle() const { return (WXWidget) GetHWND(); }
+//    WXHWND GetHWND() const { return m_hWnd; }
+//    void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; }
+	virtual WXWidget GetHandle() const { return (WXWidget) NULL ; }
 
     bool GetUseCtl3D() const { return m_useCtl3D; }
     bool GetTransparentBackground() const { return m_backgroundTransparent; }
@@ -181,6 +180,7 @@ public:
     // --------------
     void OnEraseBackground(wxEraseEvent& event);
     void OnIdle(wxIdleEvent& event);
+    void MacOnScroll(wxScrollEvent&event ) ;
 
 public:
     // For implementation purposes - sometimes decorations make the client area
@@ -208,12 +208,6 @@ public:
     virtual void MSWDeviceToLogical(float *x, float *y) const;
 #endif // WXWIN_COMPATIBILITY
 
-    // Create an appropriate wxWindow from a HWND
-    virtual wxWindow* CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd);
-
-    // Make sure the window style reflects the HWND style (roughly)
-    virtual void AdoptAttributesFromHWND();
-
     // Setup background and foreground colours correctly
     virtual void SetupColours();
 
@@ -226,12 +220,58 @@ public:
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
+public :
+	static bool							MacGetWindowFromPoint( const wxPoint &point , wxWindow** outWin ) ;
+	virtual void						MacActivate( EventRecord *ev , bool inIsActivating ) ;
+	virtual void						MacUpdate( EventRecord *ev ) ;
+	virtual void						MacUpdateImmediately() ;
+	virtual	void						MacRedraw( RgnHandle updatergn , long time) ;
+	virtual void						MacMouseDown( EventRecord *ev , short windowPart ) ;
+	virtual void						MacMouseUp( EventRecord *ev , short windowPart ) ;
+	virtual void						MacMouseMoved( EventRecord *ev , short windowPart ) ;
+	virtual void						MacKeyDown( EventRecord *ev ) ;
+	virtual bool						MacCanFocus() const { return true ; }
+
+	virtual void						MacFireMouseEvent( EventRecord *ev ) ;
+	virtual bool						MacDispatchMouseEvent(wxMouseEvent& event ) ;
+	virtual void						MacEraseBackground( Rect *rect ) ;
+	WindowRef								GetMacRootWindow() const  ;
+
+	virtual ControlHandle 	MacGetContainerForEmbedding() ;
+	virtual void 						MacSuperChangedPosition() ;
+
+	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) ;
+	MacWindowData*						MacGetWindowData() { return m_macWindowData ; }
+	static WindowRef					MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
+	bool								MacIsWindowScrollbar( const wxScrollBar* sb ) { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
+	static wxWindow*					s_lastMouseWindow ;
+private:
+	virtual bool						MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) ;
 protected:
-    // the window handle
-    WXHWND                m_hWnd;
 
-    // the old window proc (we subclass all windows)
-    WXFARPROC             m_oldWndProc;
+	MacWindowData*				m_macWindowData ;
+	static WindowRef			s_macWindowInUpdate ;
+
+	int 									m_x ;
+	int 									m_y ;	
+	int 									m_width ;
+	int 									m_height ;
+
+	wxScrollBar*					m_hScrollBar ;
+	wxScrollBar*					m_vScrollBar ;
+	wxString						m_label ;
+
+	void									MacCreateScrollBars( long style ) ;
+	void									MacRepositionScrollBars() ;
 
     // additional (MSW specific) flags
     bool                  m_useCtl3D:1; // Using CTL3D for this control
@@ -244,10 +284,7 @@ protected:
     int                   m_xThumbSize;
     int                   m_yThumbSize;
 
-    WXHMENU               m_hMenu; // Menu, if any
-
-    // the return value of WM_GETDLGCODE handler
-    long m_lDlgCode;
+//    WXHMENU               m_hMenu; // Menu, if any
 
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;