Moved tweak support to USER dll. Removed tweak.h and cache.h.
diff --git a/controls/button.c b/controls/button.c
index d75004d..1983dd1 100644
--- a/controls/button.c
+++ b/controls/button.c
@@ -13,7 +13,7 @@
#include "wingdi.h"
#include "wine/winuser16.h"
#include "controls.h"
-#include "tweak.h"
+#include "user.h"
/* Note: under MS-Windows, state is a BYTE and this structure is
* only 3 bytes long. I don't think there are programs out there
diff --git a/controls/combo.c b/controls/combo.c
index f50e88a..a26824c 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -19,7 +19,6 @@
#include "heap.h"
#include "controls.h"
#include "debugtools.h"
-#include "tweak.h"
DEFAULT_DEBUG_CHANNEL(combo);
diff --git a/controls/edit.c b/controls/edit.c
index e0c4d27..cd2b5dc 100644
--- a/controls/edit.c
+++ b/controls/edit.c
@@ -24,8 +24,8 @@
#include "wine/unicode.h"
#include "controls.h"
#include "local.h"
+#include "user.h"
#include "debugtools.h"
-#include "tweak.h"
DEFAULT_DEBUG_CHANNEL(edit);
DECLARE_DEBUG_CHANNEL(combo);
diff --git a/controls/listbox.c b/controls/listbox.c
index 24920d7..a7da000 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -16,9 +16,9 @@
#include "winerror.h"
#include "spy.h"
#include "win.h"
+#include "user.h"
#include "controls.h"
#include "debugtools.h"
-#include "tweak.h"
DEFAULT_DEBUG_CHANNEL(listbox);
DECLARE_DEBUG_CHANNEL(combo);
diff --git a/controls/menu.c b/controls/menu.c
index 5688676..43936be 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -32,7 +32,6 @@
#include "user.h"
#include "message.h"
#include "queue.h"
-#include "tweak.h"
#include "debugtools.h"
diff --git a/controls/scroll.c b/controls/scroll.c
index ec7049f..bc0706b 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -12,8 +12,7 @@
#include "heap.h"
#include "win.h"
#include "debugtools.h"
-#include "cache.h"
-#include "tweak.h"
+#include "user.h"
DEFAULT_DEBUG_CHANNEL(scroll);
@@ -673,16 +672,7 @@
if (TWEAK_WineLook == WIN31_LOOK && (flags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH)
{
/* This ought to be the color of the parent window */
- if (TWEAK_WineLook == WIN31_LOOK) {
- hBrush = GetSysColorBrush(COLOR_WINDOW);
- } else {
- /* Under Win9x look & feel, scrollbars don't have a solid border.
- * To make scrollbar's background different from the window
- * background, we need to apply a gray 0x55aa pattern brush.
- * Otherwise it won't look good.
- */
- hBrush = CACHE_GetPattern55AABrush();
- }
+ hBrush = GetSysColorBrush(COLOR_WINDOW);
}
else
{
diff --git a/controls/static.c b/controls/static.c
index a5b1ca1..fa127b6 100644
--- a/controls/static.c
+++ b/controls/static.c
@@ -12,8 +12,8 @@
#include "cursoricon.h"
#include "controls.h"
#include "heap.h"
+#include "user.h"
#include "debugtools.h"
-#include "tweak.h"
DEFAULT_DEBUG_CHANNEL(static);
diff --git a/controls/uitools.c b/controls/uitools.c
index 820bb36..e2aadd2 100644
--- a/controls/uitools.c
+++ b/controls/uitools.c
@@ -9,8 +9,8 @@
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winuser.h"
+#include "user.h"
#include "debugtools.h"
-#include "tweak.h"
DEFAULT_DEBUG_CHANNEL(graphics);
