Alexandre Julliard : user: Only include winproc.h where necessary.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 14fb1ddcc5d8959a6e3c1595a5f9265bb20f5b7d
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=14fb1ddcc5d8959a6e3c1595...

Author: Alexandre Julliard 
Date:   Fri May 26 14:54:54 2006 +0200

user: Only include winproc.h where necessary.

---

dlls/user/controls.h |    8 +++++++-
 dlls/user/user16.c   |    2 +-
 dlls/user/win.c      |    1 +
 dlls/user/winproc.h  |    7 -------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/user/controls.h b/dlls/user/controls.h
index eef1776..98dfa4d 100644
--- a/dlls/user/controls.h
+++ b/dlls/user/controls.h
@@ -22,7 +22,7 @@ #ifndef __WINE_CONTROLS_H
 #define __WINE_CONTROLS_H

#include "winuser.h"
-#include "winproc.h"
+#include "wine/winbase16.h"

/* Built-in class names (see _Undocumented_Windows_ p.418) */
 #define POPUPMENU_CLASS_ATOMA MAKEINTATOMA(32768)  /* PopupMenu */
@@ -45,6 +45,12 @@ struct builtin_class_descr
     HBRUSH    brush;   /* brush or system color */
 };

+/* Class functions */
+struct tagCLASS;  /* opaque structure */
+struct tagWND;
+extern void CLASS_RegisterBuiltinClasses(void);
+extern void CLASS_AddWindow( struct tagCLASS *class, struct tagWND *win, BOOL unicode );
+extern void CLASS_FreeModuleClasses( HMODULE16 hModule );

/* defwnd proc */
 extern HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType );
diff --git a/dlls/user/user16.c b/dlls/user/user16.c
index 3ffde37..37535ee 100644
--- a/dlls/user/user16.c
+++ b/dlls/user/user16.c
@@ -30,7 +30,7 @@ #include "winbase.h"
 #include "wownt32.h"
 #include "user_private.h"
 #include "win.h"
-#include "winproc.h"
+#include "controls.h"
 #include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(user);
diff --git a/dlls/user/win.c b/dlls/user/win.c
index 4c1845d..080835c 100644
--- a/dlls/user/win.c
+++ b/dlls/user/win.c
@@ -33,6 +33,7 @@ #include "wownt32.h"
 #include "wine/server.h"
 #include "wine/unicode.h"
 #include "win.h"
+#include "winproc.h"
 #include "user_private.h"
 #include "controls.h"
 #include "winpos.h"
diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h
index 4821140..69b6d76 100644
--- a/dlls/user/winproc.h
+++ b/dlls/user/winproc.h
@@ -49,11 +49,4 @@ extern INT_PTR WINPROC_CallDlgProc16( DL
 extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
 extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );

-/* Class functions */
-struct tagCLASS;  /* opaque structure */
-struct tagWND;
-extern void CLASS_RegisterBuiltinClasses(void);
-extern void CLASS_AddWindow( struct tagCLASS *class, struct tagWND *win, BOOL unicode );
-extern void CLASS_FreeModuleClasses( HMODULE16 hModule );
-
 #endif  /* __WINE_WINPROC_H */