commit 7f3418fba089c3c4633e45cc16bfe4feba2abc59
author Alexandre Julliard <julliard@winehq.org> Sat Mar 25 17:30:13 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Mar 25 17:30:13 2000 +0000
tree 3b5eb2cdf2cfaf4c0de0c0a2638d90af95824cc6
parent 9383eb94a75fb1115d595512714981ddac7b36b4

Store monitor size and depth in the generic structure.
Merged monitor driver into USER driver.

controls/desktop.c

diff --git a/controls/desktop.c b/controls/desktop.c
index 786921f..1341ff3 100644
--- a/controls/desktop.c
+++ b/controls/desktop.c
@@ -12,69 +12,12 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "heap.h"
-#include "monitor.h"
+#include "user.h"
 #include "win.h"
 #include "wine/winuser16.h"
 
 
 /***********************************************************************
- *		DESKTOP_IsSingleWindow
- */
-BOOL DESKTOP_IsSingleWindow(void)
-{
-  BOOL retvalue;
-  DESKTOP *pDesktop = (DESKTOP *) WIN_GetDesktop()->wExtra;
-  retvalue = MONITOR_IsSingleWindow(pDesktop->pPrimaryMonitor);
-  WIN_ReleaseDesktop();
-  return retvalue;
-}
-
-/***********************************************************************
- *              DESKTOP_GetScreenWidth
- *
- * Return the width of the screen associated to the current desktop.
- */
-int DESKTOP_GetScreenWidth()
-{
-    int retvalue;
-  DESKTOP *pDesktop = (DESKTOP *) WIN_GetDesktop()->wExtra;
-    retvalue = MONITOR_GetWidth(pDesktop->pPrimaryMonitor);
-    WIN_ReleaseDesktop();
-    return retvalue;
-    
-}
-
-/***********************************************************************
- *              DESKTOP_GetScreenHeight
- *
- * Return the height of the screen associated to the current desktop.
- */
-int DESKTOP_GetScreenHeight()
-{
-    int retvalue;
-  DESKTOP *pDesktop = (DESKTOP *) WIN_GetDesktop()->wExtra;
-    retvalue = MONITOR_GetHeight(pDesktop->pPrimaryMonitor);
-    WIN_ReleaseDesktop();
-    return retvalue;
-    
-}
-
-/***********************************************************************
- *              DESKTOP_GetScreenDepth
- *
- * Return the depth of the screen associated to the current desktop.
- */
-int DESKTOP_GetScreenDepth()
-{
-    int retvalue;
-  DESKTOP *pDesktop = (DESKTOP *) WIN_GetDesktop()->wExtra;
-    retvalue = MONITOR_GetDepth(pDesktop->pPrimaryMonitor);
-    WIN_ReleaseDesktop();
-    return retvalue;
-
-}
-
-/***********************************************************************
  *           DESKTOP_LoadBitmap
  *
  * Load a bitmap from a file. Used by SetDeskWallPaper().
@@ -216,7 +159,7 @@
         return  1;
 	
     case WM_ERASEBKGND:
-	if(!DESKTOP_IsSingleWindow())
+	if(!USER_Driver->pIsSingleWindow())
             return  1;
         return  DESKTOP_DoEraseBkgnd( hwnd, (HDC)wParam, desktopPtr );