commit 91222da88155a6a4489ac74e7db62c9da4593574
author Alexandre Julliard <julliard@winehq.org> Sun Dec 10 23:01:33 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Dec 10 23:01:33 2000 +0000
tree c7b9a301dc19f69d9107305947d287623faad482
parent 84f91bd3fcce75c6d49c46e549c0535437490345

Moved most builtin controls structures into their respective C file.
Created new controls.h file private to user32.dll and moved remaining
builtin controls definitions there.

controls/static.c

diff --git a/controls/static.c b/controls/static.c
index f27b30b..951e4ad 100644
--- a/controls/static.c
+++ b/controls/static.c
@@ -10,7 +10,7 @@
 #include "wine/winuser16.h"
 #include "win.h"
 #include "cursoricon.h"
-#include "static.h"
+#include "controls.h"
 #include "heap.h"
 #include "debugtools.h"
 #include "tweak.h"
@@ -23,9 +23,16 @@
 static void STATIC_PaintIconfn( WND *wndPtr, HDC hdc );
 static void STATIC_PaintBitmapfn( WND *wndPtr, HDC hdc );
 static void STATIC_PaintEtchedfn( WND *wndPtr, HDC hdc );
+static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
 
 static COLORREF color_windowframe, color_background, color_window;
 
+typedef struct
+{
+    HFONT16  hFont;   /* Control font (or 0 for system font) */
+    WORD     dummy;   /* Don't know what MS-Windows puts in there */
+    HICON16  hIcon;   /* Icon handle for SS_ICON controls */
+} STATICINFO;
 
 typedef void (*pfPaint)( WND *, HDC );
 
@@ -53,6 +60,21 @@
 };
 
 
+/*********************************************************************
+ * static class descriptor
+ */
+const struct builtin_class_descr STATIC_builtin_class =
+{
+    "Static",            /* name */
+    CS_GLOBALCLASS | CS_DBLCLKS | CS_PARENTDC, /* style  */
+    StaticWndProcA,      /* procA */
+    NULL,                /* procW (FIXME) */
+    sizeof(STATICINFO),  /* extra */
+    IDC_ARROWA,          /* cursor */
+    0                    /* brush */
+};
+
+
 /***********************************************************************
  *           STATIC_SetIcon
  *
@@ -135,10 +157,9 @@
 
 
 /***********************************************************************
- *           StaticWndProc
+ *           StaticWndProcA
  */
-LRESULT WINAPI StaticWndProc( HWND hWnd, UINT uMsg, WPARAM wParam,
-                              LPARAM lParam )
+static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
     LRESULT lResult = 0;
     WND *wndPtr = WIN_FindWndPtr(hWnd);