commit b87fe2e9bf5b89d1e95f3027734af22040814e31
author Patrik Stridvall <ps@leissner.se> Thu Apr 01 08:16:08 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Apr 01 08:16:08 1999 +0000
tree f37bed17898c76aaf5a6b1a65fbdac5a9f7b0895
parent 24b1c9c3698d034cc9b7ab47d0d2d7d9ca8075c0

More code moved to the X11 driver (bitmap and palette and misc).

windows/win.c

diff --git a/windows/win.c b/windows/win.c
index e2ea887..402319d 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -4,8 +4,6 @@
  * Copyright 1993, 1994 Alexandre Julliard
  */
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include "wine/winbase16.h"
@@ -36,13 +34,9 @@
 #include "local.h"
 #include "desktop.h"
 
-#ifndef X_DISPLAY_MISSING
-extern DESKTOP_DRIVER X11DRV_DESKTOP_Driver;
-extern WND_DRIVER X11DRV_WND_Driver;
-#else /* X_DISPLAY_MISSING */
-extern DESKTOP_DRIVER TTYDRV_DESKTOP_Driver;
-extern WND_DRIVER TTYDRV_WND_Driver;
-#endif /* X_DISPLAY_MISSING */
+/**********************************************************************/
+
+WND_DRIVER *WND_Driver = NULL;
 
 /* Desktop window */
 static WND *pWndDesktop = NULL;
@@ -624,13 +618,8 @@
     pWndDesktop = (WND *) USER_HEAP_LIN_ADDR( hwndDesktop );
 
     pDesktop = (DESKTOP *) pWndDesktop->wExtra;
-#ifndef X_DISPLAY_MISSING
-    pDesktop->pDriver = &X11DRV_DESKTOP_Driver;
-    pWndDesktop->pDriver = &X11DRV_WND_Driver;
-#else /* X_DISPLAY_MISSING */
-    pDesktop->pDriver = &TTYDRV_DESKTOP_Driver;
-    pWndDesktop->pDriver = &TTYDRV_WND_Driver;
-#endif /* X_DISPLAY_MISSING */
+    pDesktop->pDriver = DESKTOP_Driver;
+    pWndDesktop->pDriver = WND_Driver;
 
     pDesktop->pDriver->pInitialize(pDesktop);
     pWndDesktop->pDriver->pInitialize(pWndDesktop);
@@ -1179,7 +1168,7 @@
     WIN_CheckFocus(pWnd);
 
     if( CARET_GetHwnd() == pWnd->hwndSelf ) DestroyCaret();
-    CLIPBOARD_GetDriver()->pResetOwner( pWnd, TRUE ); 
+    CLIPBOARD_Driver->pResetOwner( pWnd, TRUE ); 
 
     /*
      * Send the WM_DESTROY to the window.
@@ -1320,7 +1309,7 @@
             }
 	}
 
-    CLIPBOARD_GetDriver()->pResetOwner( wndPtr, FALSE ); /* before the window is unmapped */
+    CLIPBOARD_Driver->pResetOwner( wndPtr, FALSE ); /* before the window is unmapped */
 
       /* Hide the window */