summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2015-07-31 20:20:00 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2015-11-03 17:16:35 +0000
commit8c5b5352a678847e155355bb789c655cf5234026 (patch)
tree31bd6c3accc4a375cd96bd0176f24118247499ba
parent67f7cea0cafc25d7eeee251bda76cc4d10336809 (diff)
Remove unused FinishCreateWindowsWindow engine function
This only ever had an (unused) implementation in the DDNL engine, which was removed in commit 57bbf6e2.
-rw-r--r--hw/xwin/win.h8
-rw-r--r--hw/xwin/winmultiwindowwindow.c4
-rw-r--r--hw/xwin/winshadddnl.c4
-rw-r--r--hw/xwin/winshadgdi.c4
4 files changed, 0 insertions, 20 deletions
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 0a4219a36..2b2f557f9 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -291,8 +291,6 @@ typedef Bool (*winCreatePrimarySurfaceProcPtr) (ScreenPtr);
typedef Bool (*winReleasePrimarySurfaceProcPtr) (ScreenPtr);
-typedef Bool (*winFinishCreateWindowsWindowProcPtr) (WindowPtr pWin);
-
typedef Bool (*winCreateScreenResourcesProc) (ScreenPtr);
/*
@@ -525,14 +523,8 @@ typedef struct _winPrivScreenRec {
winDestroyColormapProcPtr pwinDestroyColormap;
winCreatePrimarySurfaceProcPtr pwinCreatePrimarySurface;
winReleasePrimarySurfaceProcPtr pwinReleasePrimarySurface;
-
winCreateScreenResourcesProc pwinCreateScreenResources;
-#ifdef XWIN_MULTIWINDOW
- /* Window Procedures for MultiWindow mode */
- winFinishCreateWindowsWindowProcPtr pwinFinishCreateWindowsWindow;
-#endif
-
/* Window Procedures for Rootless mode */
CreateWindowProcPtr CreateWindow;
DestroyWindowProcPtr DestroyWindow;
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 7117a0b8b..28828af8a 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -551,7 +551,6 @@ winCreateWindowsTopLevelWindow(WindowPtr pWin)
HWND hFore = NULL;
winWindowPriv(pWin);
- winPrivScreenPtr pScreenPriv = pWinPriv->pScreenPriv;
WinXSizeHints hints;
Window daddyId;
DWORD dwStyle, dwExStyle;
@@ -691,9 +690,6 @@ winCreateWindowsTopLevelWindow(WindowPtr pWin)
/* Flag that this Windows window handles its own activation */
SetProp(hWnd, WIN_NEEDMANAGE_PROP, (HANDLE) 0);
-
- /* Call engine-specific create window procedure */
- (*pScreenPriv->pwinFinishCreateWindowsWindow) (pWin);
}
static void
diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c
index 074ebf307..0ec5246fc 100644
--- a/hw/xwin/winshadddnl.c
+++ b/hw/xwin/winshadddnl.c
@@ -1213,10 +1213,6 @@ winSetEngineFunctionsShadowDDNL(ScreenPtr pScreen)
pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowDDNL;
pScreenPriv->pwinCreatePrimarySurface = winCreatePrimarySurfaceShadowDDNL;
pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDDNL;
-#ifdef XWIN_MULTIWINDOW
- pScreenPriv->pwinFinishCreateWindowsWindow
- = (winFinishCreateWindowsWindowProcPtr) (void (*)(void)) NoopDDA;
-#endif
return TRUE;
}
diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c
index ba2e84e1e..c84bf5676 100644
--- a/hw/xwin/winshadgdi.c
+++ b/hw/xwin/winshadgdi.c
@@ -1147,10 +1147,6 @@ winSetEngineFunctionsShadowGDI(ScreenPtr pScreen)
(winCreatePrimarySurfaceProcPtr) (void (*)(void)) NoopDDA;
pScreenPriv->pwinReleasePrimarySurface =
(winReleasePrimarySurfaceProcPtr) (void (*)(void)) NoopDDA;
-#ifdef XWIN_MULTIWINDOW
- pScreenPriv->pwinFinishCreateWindowsWindow =
- (winFinishCreateWindowsWindowProcPtr) (void (*)(void)) NoopDDA;
-#endif
return TRUE;
}