Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Recheckin in over the last checkin from donc which was bad.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@10158 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kmcclusk%netscape.com
1998-09-16 17:18:57 +00:00
parent f2d34bbd14
commit f66f963cdc
1 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/widget/src/motif/nsWindow.h
View File

@@ -121,33 +121,9 @@ public:
virtual void BeginResizingChildren(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); };
>>>>>>> 1.32
<<<<<<< nsWindow.h
virtual PRUint32 GetYCoord(PRUint32 aNewY);
=======
>>>>>>> 1.32
<<<<<<< nsWindow.h
virtual void ConvertToDeviceCoordinates(nscoord &aX,nscoord &aY) {}
=======
// Utility methods
void SetBounds(const nsRect &aRect);
PRBool ConvertStatus(nsEventStatus aStatus);
@@ -162,7 +138,6 @@ public:
PRUint32 GetYCoord(PRUint32 aNewY);
PRBool DispatchMouseEvent(nsMouseEvent& aEvent);
PRBool OnResize(nsSizeEvent &aEvent);
>>>>>>> 1.32
// Resize event management