[gedmurphy] 22382: remove the monitor bitmap as per bug 1497

Author: gedmurphy
Date: Sat Jun 17 16:31:31 2006
New Revision: 22382

URL: http://svn.reactos.ru/svn/reactos?rev=22382&view=rev
Log:
remove the monitor bitmap as per bug 1497

Removed:
    branches/ros-branch-0_3_0/reactos/dll/cpl/desk/resources/monitor.bmp
Modified:
    branches/ros-branch-0_3_0/reactos/dll/cpl/desk/background.c
    branches/ros-branch-0_3_0/reactos/dll/cpl/desk/settings.c

Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/desk/background.c
URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl/...
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/cpl/desk/background.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/cpl/desk/background.c Sat Jun 17 16:31:31 2006
@@ -42,9 +42,6 @@
 HWND g_hColorButton             = NULL;

HIMAGELIST g_hShellImageList    = NULL;
-
-static HBITMAP hBitmap = NULL;
-static int cxSource, cySource;

/* Add the images in the C:\ReactOS directory and the current wallpaper if any */
 void AddListViewItems()
@@ -229,7 +226,6 @@
     DWORD bufferSize = sizeof(szBuffer);
     DWORD varType = REG_SZ;
     LONG result;
-    BITMAP bitmap;

g_hBackgroundList       = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_LIST);
     g_hBackgroundPreview    = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_PREVIEW);
@@ -284,15 +280,6 @@
     }

RegCloseKey(regKey);
-
-    hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT);
-    if (hBitmap != NULL)
-    {
-        GetObject(hBitmap, sizeof(BITMAP), &bitmap);
-
-        cxSource = bitmap.bmWidth;
-        cySource = bitmap.bmHeight;
-    }
 }

void OnColorButton()
@@ -582,23 +569,6 @@
                 }
             } break;

-        case WM_PAINT:
-            {
-                PAINTSTRUCT ps;
-                HDC hdc, hdcMem;
-       
-                hdc = BeginPaint(hwndDlg, &ps);
- 
-                hdcMem = CreateCompatibleDC(hdc);
-                SelectObject(hdcMem, hBitmap);
-
-                TransparentBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, cxSource, cySource, 0xFF80FF);
-
-                DeleteDC(hdcMem);
-                EndPaint(hwndDlg, &ps);
-
-            } break;
-
         case WM_DRAWITEM:
             {
                 LPDRAWITEMSTRUCT drawItem;
@@ -646,8 +616,6 @@
                 if(g_pWallpaperBitmap != NULL)
                     DibFreeImage(g_pWallpaperBitmap);

-                DeleteObject(hBitmap);
-
             } break;
     }

Removed: branches/ros-branch-0_3_0/reactos/dll/cpl/desk/resources/monitor.bmp
URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl/...
==============================================================================
Binary file - no diff available.

Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/desk/settings.c
URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl/...
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/cpl/desk/settings.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/cpl/desk/settings.c Sat Jun 17 16:31:31 2006
@@ -44,9 +44,6 @@

static PDISPLAY_DEVICE_ENTRY DisplayDeviceList = NULL;
 static PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice = NULL;
-
-HBITMAP hBitmap = NULL;
-int cxSource, cySource;

static VOID
 UpdateDisplay(IN HWND hwndDlg)
@@ -267,7 +264,6 @@
    DWORD Result = 0;
    DWORD iDevNum = 0;
    DISPLAY_DEVICE displayDevice;
-    BITMAP bitmap;
    
    /* Get video cards list */
    displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE);
@@ -299,15 +295,6 @@
    	/* FIXME: multi video adapter */
    	/* FIXME: choose selected adapter being the primary one */
    }
-
-    hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT);
-    if (hBitmap != NULL)
-    {
-        GetObject(hBitmap, sizeof(BITMAP), &bitmap);
-
-        cxSource = bitmap.bmWidth;
-        cySource = bitmap.bmHeight;
-    }
 }

static VOID
@@ -571,24 +558,6 @@
    		}
    		break;
    	}
-
-        case WM_PAINT:
-            {
-                PAINTSTRUCT ps;
-                HDC hdc, hdcMem;
-       
-                hdc = BeginPaint(hwndDlg, &ps);
- 
-                hdcMem = CreateCompatibleDC(hdc);
-                SelectObject(hdcMem, hBitmap);
-
-                TransparentBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, cxSource, cySource, 0xFF80FF);
-
-                DeleteDC(hdcMem);
-                EndPaint(hwndDlg, &ps);
-
-            } break;
-
    	case WM_DESTROY:
    	{
    		PDISPLAY_DEVICE_ENTRY Current = DisplayDeviceList;
@@ -605,8 +574,6 @@
    			HeapFree(GetProcessHeap(), 0, Current);
    			Current = Next;
    		}
-
-            DeleteObject(hBitmap);
    	}
    }
    return FALSE;