зеркало из https://github.com/mozilla/gecko-dev.git
Recheckin in over the last checkin from donc which was bad.
This commit is contained in:
Родитель
24c5f90cb6
Коммит
8ce2d1bb2c
|
@ -121,33 +121,9 @@ public:
|
||||||
virtual void BeginResizingChildren(void);
|
virtual void BeginResizingChildren(void);
|
||||||
virtual void EndResizingChildren(void);
|
virtual void EndResizingChildren(void);
|
||||||
|
|
||||||
static PRBool ConvertStatus(nsEventStatus aStatus);
|
|
||||||
virtual PRBool DispatchEvent(nsGUIEvent* event);
|
|
||||||
virtual PRBool DispatchMouseEvent(nsMouseEvent& aEvent);
|
|
||||||
|
|
||||||
virtual void OnDestroy();
|
|
||||||
virtual PRBool OnPaint(nsPaintEvent &event);
|
|
||||||
virtual PRBool OnResize(nsSizeEvent &aEvent);
|
|
||||||
virtual PRBool OnKey(PRUint32 aEventType, PRUint32 aKeyCode, nsKeyEvent* aEvent);
|
|
||||||
|
|
||||||
virtual PRBool DispatchFocus(nsGUIEvent &aEvent);
|
|
||||||
virtual PRBool OnScroll(nsScrollbarEvent & aEvent, PRUint32 cPos);
|
|
||||||
|
|
||||||
<<<<<<< nsWindow.h
|
|
||||||
virtual void SetIgnoreResize(PRBool aIgnore);
|
|
||||||
virtual PRBool IgnoreResize();
|
|
||||||
=======
|
|
||||||
virtual PRBool IsChild() { return(PR_FALSE); };
|
virtual PRBool IsChild() { return(PR_FALSE); };
|
||||||
>>>>>>> 1.32
|
|
||||||
|
|
||||||
<<<<<<< nsWindow.h
|
|
||||||
virtual PRUint32 GetYCoord(PRUint32 aNewY);
|
|
||||||
=======
|
|
||||||
>>>>>>> 1.32
|
|
||||||
|
|
||||||
<<<<<<< nsWindow.h
|
|
||||||
virtual void ConvertToDeviceCoordinates(nscoord &aX,nscoord &aY) {}
|
|
||||||
=======
|
|
||||||
// Utility methods
|
// Utility methods
|
||||||
void SetBounds(const nsRect &aRect);
|
void SetBounds(const nsRect &aRect);
|
||||||
PRBool ConvertStatus(nsEventStatus aStatus);
|
PRBool ConvertStatus(nsEventStatus aStatus);
|
||||||
|
@ -162,7 +138,6 @@ public:
|
||||||
PRUint32 GetYCoord(PRUint32 aNewY);
|
PRUint32 GetYCoord(PRUint32 aNewY);
|
||||||
PRBool DispatchMouseEvent(nsMouseEvent& aEvent);
|
PRBool DispatchMouseEvent(nsMouseEvent& aEvent);
|
||||||
PRBool OnResize(nsSizeEvent &aEvent);
|
PRBool OnResize(nsSizeEvent &aEvent);
|
||||||
>>>>>>> 1.32
|
|
||||||
|
|
||||||
|
|
||||||
// Resize event management
|
// Resize event management
|
||||||
|
|
Загрузка…
Ссылка в новой задаче