Changeset 2666 for trunk/src/user32/button.cpp

Timestamp:

Feb 5, 2000, 8:45:19 PM (26 years ago)

Author:

cbratschi

Message:

several fixes -> changelog

File:

• trunk/src/user32/button.cpp (modified) (6 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.31 2000-02-03 17:13:00 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.32 2000-02-05 19:45:14 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -688 +688 @@
 }
 
-static INT BUTTON_GetTextFormat(DWORD dwStyle,INT defHorz,INT defVert)
+static INT BUTTON_GetTextFormat(DWORD dwStyle,DWORD dwExStyle,INT defHorz,INT defVert)
 {
   INT format = 0;
@@ -694 +694 @@
   if (dwStyle & BS_LEFT) format = DT_LEFT;
   else if (dwStyle & BS_CENTER) format = DT_CENTER;
-  else if (dwStyle & BS_RIGHT) format = DT_RIGHT;
+  else if ((dwStyle & BS_RIGHT) || (dwExStyle & WS_EX_RIGHT)) format = DT_RIGHT;
   else format = defHorz;
 
@@ -775 +775 @@
     if ((textLen > 0) && (!(dwStyle & (BS_ICON|BS_BITMAP))))
     {
-        INT format = BUTTON_GetTextFormat(dwStyle,DT_CENTER,DT_VCENTER);
+        INT format = BUTTON_GetTextFormat(dwStyle,GetWindowLongA(hwnd,GWL_EXSTYLE),DT_CENTER,DT_VCENTER);
 
         textLen++;
@@ -999 +999 @@
         if( text && action != ODA_SELECT )
         {
-          INT format = BUTTON_GetTextFormat(dwStyle,DT_TOP,DT_VCENTER);
+          INT format = BUTTON_GetTextFormat(dwStyle,GetWindowLongA(hwnd,GWL_EXSTYLE),DT_TOP,DT_VCENTER);
 
           if (dwStyle & WS_DISABLED) DrawDisabledText(hDC,text,&rtext,format);
@@ -1084 +1084 @@
     if (textLen > 0)
     {
-      INT format = BUTTON_GetTextFormat(dwStyle,DT_LEFT,DT_TOP) | DT_NOCLIP | DT_SINGLELINE;
+      INT format = BUTTON_GetTextFormat(dwStyle,GetWindowLongA(hwnd,GWL_EXSTYLE),DT_LEFT,DT_TOP) | DT_NOCLIP | DT_SINGLELINE;
 
       textLen++;