diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
| commit | 1dad092caf01d733990648e6df64cbf964df5143 (patch) | |
| tree | 39de0e643e76754a3e23ca9dd0350b8ba4f76250 /nx-X11/programs/Xserver/include/window.h | |
| parent | 6d70b9e3c47f27a166f4aacb522c5c1e49092dd9 (diff) | |
| parent | 2b9025f797ee322e21077e100c2ee27c2e7fa0e0 (diff) | |
| download | nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.gz nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.bz2 nx-libs-1dad092caf01d733990648e6df64cbf964df5143.zip | |
Merge branch '3.6.x'
Diffstat (limited to 'nx-X11/programs/Xserver/include/window.h')
| -rw-r--r-- | nx-X11/programs/Xserver/include/window.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/include/window.h b/nx-X11/programs/Xserver/include/window.h index 7c3fce092..a8c78f569 100644 --- a/nx-X11/programs/Xserver/include/window.h +++ b/nx-X11/programs/Xserver/include/window.h @@ -1,4 +1,3 @@ -/* $Xorg: window.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifndef WINDOW_H #define WINDOW_H @@ -53,7 +51,7 @@ SOFTWARE. #include "misc.h" #include "region.h" #include "screenint.h" -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #define TOTALLY_OBSCURED 0 #define UNOBSCURED 1 @@ -73,17 +71,17 @@ typedef struct _Window *WindowPtr; typedef int (*VisitWindowProcPtr)( WindowPtr /*pWin*/, - pointer /*data*/); + void * /*data*/); extern int TraverseTree( WindowPtr /*pWin*/, VisitWindowProcPtr /*func*/, - pointer /*data*/); + void * /*data*/); extern int WalkTree( ScreenPtr /*pScreen*/, VisitWindowProcPtr /*func*/, - pointer /*data*/); + void * /*data*/); extern WindowPtr AllocateWindow( ScreenPtr /*pScreen*/); @@ -102,6 +100,10 @@ extern void ClippedRegionFromBox( int /*w*/, int /*h*/); +typedef WindowPtr (* RealChildHeadProc) (WindowPtr pWin); + +void RegisterRealChildHeadProc (RealChildHeadProc proc); + extern WindowPtr RealChildHead( WindowPtr /*pWin*/); @@ -122,7 +124,7 @@ extern WindowPtr CreateWindow( int* /*error*/); extern int DeleteWindow( - pointer /*pWin*/, + void * /*pWin*/, XID /*wid*/); extern void DestroySubwindows( |