Changeset 22097 for branches/swt/src/user32/button.cpp

Timestamp:

May 14, 2015, 9:55:51 PM (11 years ago)

Author:

rousseau

Message:

Include a bunch of Console Debug calls

File:

• branches/swt/src/user32/button.cpp (modified) (11 diffs)

branches/swt/src/user32/button.cpp

@@ -16 +16 @@
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <os2win.h>
 #include "controls.h"
@@ -531 +532 @@
 static LRESULT BUTTON_SetStyle(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
+  __con_debug(2,"USER32::BUTTON_SetStyle(hwnd=%08X,wParam=%08X,lParam=%08X\n",hwnd,wParam,lParam);
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE),newStyle;
 
   if ((wParam & 0x0F) >= MAX_BTN_TYPE) return 0;
   newStyle = (dwStyle & 0xFFFFFFF0) | (wParam & 0x0000000F);
+  __con_debug(2,"USER32::BUTTON_SetStyle(newStyle=%08X\n",newStyle);
 
   if (newStyle != dwStyle)
@@ -775 +778 @@
 {
   INT format = 0;
-
+  __con_debug(2,"USER32::BUTTON_GetTextFormat: dwStyle=%08X, dwExStyle=%08X, dh=%d, dv=%d\n",
+        dwStyle,dwExStyle,defHorz,defVert);
   /*
    * BS_CENTER is not a single bit-flag, but is actually BS_LEFT | BS_RIGHT.
@@ -806 +810 @@
   BOOL pushedState )
 {
+    __con_debug(2,"\n%s\n","USER32::BUTTON_DrawPushButton");
     RECT rc, focus_rect;
     HPEN hOldPen;
@@ -811 +816 @@
     BUTTONINFO *infoPtr = (BUTTONINFO *)GetInfoPtr(hwnd);
     DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+    __con_debug(2,"USER32::BUTTON_DrawPushButton: dwStyle=%08X\n",dwStyle);
     int xBorderOffset, yBorderOffset;
     xBorderOffset = yBorderOffset = 0;
@@ -817 +823 @@
 
     GetClientRect( hwnd, &rc );
-
+    __con_debug(2,"USER32::BUTTON_DrawPushButton: l=%d, r=%d, t=%d, b=%d\n",
+        rc.left,rc.right,rc.top,rc.bottom);
       /* Send WM_CTLCOLOR to allow changing the font (the colors are fixed) */
     if (infoPtr->hFont) SelectObject( hDC, infoPtr->hFont );
@@ -830 +837 @@
         InflateRect( &rc, -1, -1 );
     }
-
+    __con_debug(2,"(USER32::BUTTON_DrawPushButton: l=%d, r=%d, t=%d, b=%d\n",
+        rc.left,rc.right,rc.top,rc.bottom);
     UINT uState = DFCS_BUTTONPUSH;
 
@@ -845 +853 @@
     DrawFrameControl( hDC, &rc, DFC_BUTTON, uState );
     InflateRect( &rc, -2, -2 );
-
+    __con_debug(2,"(USER32::BUTTON_DrawPushButton: l=%d, r=%d, t=%d, b=%d\n",
+        rc.left,rc.right,rc.top,rc.bottom);
     focus_rect = rc;
 
@@ -853 +862 @@
       rc.top  += 2;
     }
-
+    __con_debug(2,"(USER32::BUTTON_DrawPushButton: l=%d, r=%d, t=%d, b=%d\n",
+        rc.left,rc.right,rc.top,rc.bottom);
 
     /* draw button label, if any:
@@ -859 +869 @@
      * In win9x we don't show text if there is a bitmap or icon.
      * I don't know about win31 so I leave it as it was for win31.
-     * Dennis Björklund 12 Jul, 99
+     * Dennis Björklund 12 Jul, 99
      */
     textLen = GetWindowTextLengthA(hwnd);
@@ -865 +875 @@
     {
         INT format = BUTTON_GetTextFormat(dwStyle,GetWindowLongA(hwnd,GWL_EXSTYLE),DT_CENTER,DT_VCENTER);
+        __con_debug(2,"(USER32::BUTTON_DrawPushButton: format=%d\n",format);
 
         textLen++;