[akhaldi] 61692: [DESK] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716

Author: akhaldi
Date: Sun Jan 19 10:21:10 2014
New Revision: 61692

URL: http://svn.reactos.org/svn/reactos?rev=61692&view=rev
Log:
[DESK]
* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

Modified:
    trunk/reactos/dll/cpl/desk/appearance.h
    trunk/reactos/dll/cpl/desk/background.c
    trunk/reactos/dll/cpl/desk/desk.c
    trunk/reactos/dll/cpl/desk/desk.h
    trunk/reactos/dll/cpl/desk/devsett.c
    trunk/reactos/dll/cpl/desk/draw.h
    trunk/reactos/dll/cpl/desk/monslctl.c
    trunk/reactos/dll/cpl/desk/preview.h
    trunk/reactos/dll/cpl/desk/theme.c

Modified: trunk/reactos/dll/cpl/desk/appearance.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?r...
==============================================================================
--- trunk/reactos/dll/cpl/desk/appearance.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/appearance.h	[iso-8859-1] Sun Jan 19 10:21:10 2014
@@ -1,3 +1,5 @@
+#pragma once
+
 /* Some definitions for theme */
 #define SIZE_BORDER_WIDTH       0
 #define SIZE_SCROLL_WIDTH       1

Modified: trunk/reactos/dll/cpl/desk/background.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?r...
==============================================================================
--- trunk/reactos/dll/cpl/desk/background.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/background.c	[iso-8859-1] Sun Jan 19 10:21:10 2014
@@ -9,6 +9,8 @@
  */

#include "desk.h"
+
+#include <shellapi.h>

#define MAX_BACKGROUNDS     100

Modified: trunk/reactos/dll/cpl/desk/desk.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=616...
==============================================================================
--- trunk/reactos/dll/cpl/desk/desk.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/desk.c	[iso-8859-1] Sun Jan 19 10:21:10 2014
@@ -8,6 +8,8 @@
  */

#include "desk.h"
+
+#include <cplext.h>

#define NUM_APPLETS    (1)

Modified: trunk/reactos/dll/cpl/desk/desk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=616...
==============================================================================
--- trunk/reactos/dll/cpl/desk/desk.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/desk.h	[iso-8859-1] Sun Jan 19 10:21:10 2014
@@ -1,30 +1,24 @@
-#define COBJMACROS
+#include <stdarg.h>

#define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
+#define COBJMACROS
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
 #include <wingdi.h>
 #include <winuser.h>
 #include <wincon.h>
-#include <shellapi.h>
 #include <commdlg.h>
 #include <cpl.h>
 #include <tchar.h>
 #include <setupapi.h>
-#include <assert.h>
-#include <shlwapi.h>
 #include <shlobj.h>
 #include <regstr.h>
-#include <cplext.h>
 #include <dll/desk/deskcplx.h>
-#include <cfgmgr32.h>
-#include <uxtheme.h>
-#include <uxundoc.h>
-#include <vssym32.h>

#include "appearance.h"
 #include "preview.h"

Modified: trunk/reactos/dll/cpl/desk/devsett.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/devsett.c?rev=...
==============================================================================
--- trunk/reactos/dll/cpl/desk/devsett.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/devsett.c	[iso-8859-1] Sun Jan 19 10:21:10 2014
@@ -6,6 +6,8 @@
  */

#include "desk.h"
+
+#include <cfgmgr32.h>

#define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/cpl/desk/draw.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/draw.h?rev=616...
==============================================================================
--- trunk/reactos/dll/cpl/desk/draw.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/draw.h	[iso-8859-1] Sun Jan 19 10:21:10 2014
@@ -1,3 +1,5 @@
+#pragma once
+
 BOOL
 MyDrawFrameControl(HDC hDC, LPRECT rc, UINT uType, UINT uState, COLOR_SCHEME *scheme);
 BOOL
@@ -13,4 +15,3 @@

#define MY_BF_ACTIVEBORDER 0x1000000
 #define MY_BF_INACTIVEBORDER 0x2000000
-

Modified: trunk/reactos/dll/cpl/desk/monslctl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?rev...
==============================================================================
--- trunk/reactos/dll/cpl/desk/monslctl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/monslctl.c	[iso-8859-1] Sun Jan 19 10:21:10 2014
@@ -1,4 +1,3 @@
-
 #include "desk.h"

static const TCHAR szMonitorSelWndClass[] = TEXT("MONITORSELWNDCLASS");

Modified: trunk/reactos/dll/cpl/desk/preview.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.h?rev=...
==============================================================================
--- trunk/reactos/dll/cpl/desk/preview.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/preview.h	[iso-8859-1] Sun Jan 19 10:21:10 2014
@@ -5,6 +5,8 @@
  * PURPOSE:     Definitions used by the preview control
  * COPYRIGHT:   Copyright 2006, 2007 Eric Kohl
  */
+
+#pragma once

#define IDX_DESKTOP           0
 #define IDX_INACTIVE_CAPTION  1

Modified: trunk/reactos/dll/cpl/desk/theme.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=61...
==============================================================================
--- trunk/reactos/dll/cpl/desk/theme.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/theme.c	[iso-8859-1] Sun Jan 19 10:21:10 2014
@@ -8,6 +8,11 @@
  */

#include "desk.h"
+
+#include <shlwapi.h>
+#include <uxtheme.h>
+#include <uxundoc.h>
+#include <vssym32.h>

static const WCHAR g_CPColors[] = L"Control Panel\Colors";
 static const WCHAR g_CPANewSchemes[] = L"Control Panel\Appearance\New Schemes";
@@ -890,4 +895,3 @@

return SUCCEEDED(hres);
 }
-