Changeset 2221 for trunk/src/user32

Timestamp:

Dec 27, 1999, 11:54:49 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

Location:

trunk/src/user32

Files:

• button.cpp (modified) (2 diffs)
• edit.cpp (modified) (8 diffs)
• oslibgdi.cpp (modified) (2 diffs)
• oslibwin.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (14 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.25 1999-12-26 17:30:14 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.26 1999-12-27 22:53:51 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -466 +466 @@
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE),newStyle;
 
-  if ((wParam & 0x0f) >= MAX_BTN_TYPE) return 0;
-  newStyle = (dwStyle & 0xfffffff0) | (wParam & 0x0000000f);
+  if ((wParam & 0x0F) >= MAX_BTN_TYPE) return 0;
+  newStyle = (dwStyle & 0xFFFFFFF0) | (wParam & 0x0000000F);
 
   if (newStyle != dwStyle)
   {
     SetWindowLongA(hwnd,GWL_STYLE,newStyle);
-    PAINT_BUTTON(hwnd,newStyle & 0x0f,ODA_DRAWENTIRE);
+    PAINT_BUTTON(hwnd,newStyle & 0x0F,ODA_DRAWENTIRE);
   }
 

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.26 1999-12-27 17:08:07 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.27 1999-12-27 22:53:52 cbratschi Exp $ */
 /*
  *      Edit control
@@ -1938 +1938 @@
         INT i;
 
-        if (!lpch || *(WORD*)lpch == 0) return 0;
+        if (!lpch || (*(WORD*)lpch == 0)) return 0;
 
         if (es->style & ES_MULTILINE) {
@@ -2330 +2330 @@
         if (strl)
         {
-          if (es->style & ES_NUMBER && !EDIT_CheckNumber((CHAR*)lpsz_replace))
+          if ((es->style & ES_NUMBER) && !EDIT_CheckNumber((CHAR*)lpsz_replace))
             MessageBeep(MB_ICONEXCLAMATION);
           else
@@ -2535 +2535 @@
         EDIT_LockBuffer(hwnd, es);
 
-        if (es->text && es->text[0] != 0)
+        if (es->text && (es->text[0] != 0))
         {
           if (es->style & ES_NUMBER)
@@ -2623 +2623 @@
         //TRACE_(edit)("left=%d, right=%d\n", es->left_margin, es->right_margin);
 
-        if (oldLeft != es->left_margin || oldRight != es->right_margin)
+        if ((oldLeft != es->left_margin) || (oldRight != es->right_margin))
         {
           GetClientRect(hwnd, &r);
@@ -2738 +2738 @@
         ORDER_UINT(start, old_start);
         ORDER_UINT(old_start, old_end);
-        if (start == old_start && end == old_end) return;
+        if ((start == old_start) && (end == old_end)) return;
         if (end != old_start)
         {
@@ -2895 +2895 @@
                   if (es->style & ES_NUMBER)
                   {
-                    if ((BYTE)c < '0' || (BYTE)c > '9') MessageBeep(MB_ICONEXCLAMATION);
+                    if (((BYTE)c < '0') || ((BYTE)c > '9')) MessageBeep(MB_ICONEXCLAMATION);
                     return;
                   }
@@ -3918 +3918 @@
                         EDIT_EM_Undo(hwnd, es);
                 return 0;
-        } else if (key == VK_UP || key == VK_DOWN)
+        } else if ((key == VK_UP) || (key == VK_DOWN))
                 if (EDIT_CheckCombo(hwnd, WM_SYSKEYDOWN, key, key_data))
                         return 0;

trunk/src/user32/oslibgdi.cpp

@@ -1 @@
-/* $Id: oslibgdi.cpp,v 1.4 1999-11-26 17:06:07 cbratschi Exp $ */
+/* $Id: oslibgdi.cpp,v 1.5 1999-12-27 22:53:52 cbratschi Exp $ */
 /*
  * Window GDI wrapper functions for OS/2
@@ -16 +16 @@
 #include <stdlib.h>
 #include <string.h>
-
 #include <misc.h>
 #include <oslibgdi.h>
 #include <oslibwin.h>
+
+//CB: new mapping infrastructure to avoid transformation bugs -> available soon
+
+/*
+All functions can be used to transform from Win32 to OS/2 and vice versa
+First letter is lower case to avoid conflicts with Win32 API names
+
+Single y mapping:
+ mapScreenY()
+ mapWindowY()
+
+Single point mapping:
+ mapScreenPoint()
+ mapWindowPoint()
+
+Single rect mapping:
+ mapScreenRect()
+ mapWindowRect()
+
+Rect transformation:
+ copyOS2Rect()
+ copyWin32Rect()
+*/
+
+INT mapScreenY(INT y)
+{
+  return WinQuerySysValue(HWND_DESKTOP,SV_CYSCREEN)-1-y;
+}
+//******************************************************************************
+//******************************************************************************
+INT mapScreenY(INT screenH,INT y)
+{
+  return screenH-1-y;
+}
+
 
 //******************************************************************************

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.53 1999-12-27 17:08:08 cbratschi Exp $ */
+/* $Id: oslibwin.cpp,v 1.54 1999-12-27 22:53:53 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -109 +109 @@
 
         dwFrameStyle |= FCF_NOBYTEALIGN;
-        if (hwndParent == HWND_DESKTOP && dwFrameStyle & FCF_TITLEBAR)
+        if ((hwndParent == HWND_DESKTOP) && (dwFrameStyle & FCF_TITLEBAR))
                 dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.121 1999-12-27 17:08:08 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.122 1999-12-27 22:53:53 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -362 +362 @@
 
   /* Fix the coordinates */
-  if (cs->x == CW_USEDEFAULT || cs->x == CW_USEDEFAULT16)
+  if ((cs->x == CW_USEDEFAULT) || (cs->x == CW_USEDEFAULT16))
   {
 //        PDB *pdb = PROCESS_Current();
@@ -382 +382 @@
         * the one that comes with Win95 and NT)
         */
-        if (cs->y != CW_USEDEFAULT && cs->y != CW_USEDEFAULT16) sw = cs->y;
+        if ((cs->y != CW_USEDEFAULT) && (cs->y != CW_USEDEFAULT16)) sw = cs->y;
 
         /* We have saved cs->y, now we can trash it */
@@ -397 +397 @@
 //        }
   }
-  if (cs->cx == CW_USEDEFAULT || cs->cx == CW_USEDEFAULT16)
+  if ((cs->cx == CW_USEDEFAULT) || (cs->cx == CW_USEDEFAULT16))
   {
 #if 0
@@ -439 +439 @@
   {
         SetParent(0);
-        if (!cs->hwndParent || cs->hwndParent == windowDesktop->getWindowHandle()) {
+        if (!cs->hwndParent || (cs->hwndParent == windowDesktop->getWindowHandle())) {
             owner = NULL;
         }
@@ -784 +784 @@
     SendInternalMessageA(WM_NCDESTROY, 0, 0);
 
-    if (hwndHorzScroll && OSLibWinQueryWindow(hwndHorzScroll,QWOS_PARENT) == OSLibWinQueryObjectWindow()) OSLibWinDestroyWindow(hwndHorzScroll);
-    if (hwndVertScroll && OSLibWinQueryWindow(hwndVertScroll,QWOS_PARENT) == OSLibWinQueryObjectWindow()) OSLibWinDestroyWindow(hwndVertScroll);
+    if (hwndHorzScroll && (OSLibWinQueryWindow(hwndHorzScroll,QWOS_PARENT) == OSLibWinQueryObjectWindow())) OSLibWinDestroyWindow(hwndHorzScroll);
+    if (hwndVertScroll && (OSLibWinQueryWindow(hwndVertScroll,QWOS_PARENT) == OSLibWinQueryObjectWindow())) OSLibWinDestroyWindow(hwndVertScroll);
 
     TIMER_KillTimerFromWindow(OS2Hwnd);
@@ -991 +991 @@
 
         HWND hwndActive = GetActiveWindow();
-        if (hwndTop && getWindowHandle() != hwndActive)
+        if (hwndTop && (getWindowHandle() != hwndActive))
         {
                 LONG ret = SendInternalMessageA(WM_MOUSEACTIVATE, hwndTop,
@@ -1342 +1342 @@
     UINT uCommand = wParam & 0xFFF0;
 
-    if (getStyle() & WS_CHILD && uCommand != SC_KEYMENU )
+    if ((getStyle() & WS_CHILD) && (uCommand != SC_KEYMENU))
         ScreenToClient(getParent()->getWindowHandle(), pt32 );
 
@@ -2202 +2202 @@
         window = GetWindowFromHandle(hwnd++);
         if(window) {
-            if (window->getStyle() & WS_POPUP || (window->getStyle() & WS_CAPTION) == WS_CAPTION)
+            if ((window->getStyle() & WS_POPUP) || ((window->getStyle() & WS_CAPTION) == WS_CAPTION))
             {
 
@@ -2228 +2228 @@
         window = GetWindowFromHandle(hwnd++);
         if(window) {
-            if (window->getStyle() & WS_POPUP || (window->getStyle() & WS_CAPTION) == WS_CAPTION)
+            if ((window->getStyle() & WS_POPUP) || ((window->getStyle() & WS_CAPTION) == WS_CAPTION))
             {
 
@@ -3012 +3012 @@
   if(IsWindowDestroyed()) return;
 
-  //CB: todo: dwExStyle, creating new frame controls, destroy not used, WS_VISIBLE, ...
+  //CB: todo: dwExStyle, creating new frame controls, destroy not used controls, WS_VISIBLE, WS_CHILD, ...
   //    write test cases
-  if (dwStyle & 0xFFFF0000 != oldStyle & 0xFFFF0000)
+  if ((dwStyle & 0xFFFF0000) != (oldStyle & 0xFFFF0000))
+  {
+    //dprintf(("updateWindowStyle: %x %x",oldStyle,dwStyle));
     OSLibSetWindowStyle(OS2HwndFrame, dwStyle, fTaskList);
+  }
 }
 //******************************************************************************
@@ -3271 +3274 @@
         }
 
-        if (!child || child->getParent() != this)
+        if (!child || (child->getParent() != this))
         {
             retvalue = 0;
@@ -3339 +3342 @@
         }
 
-        if (!child || child->getParent() != this)
+        if (!child || (child->getParent() != this))
         {
             retvalue = 0;
@@ -3368 +3371 @@
     while (TRUE)
     {
-        if (!nextchild || nextchild->getStyle() & WS_GROUP)
+        if (!nextchild || (nextchild->getStyle() & WS_GROUP))
         {
             /* Wrap-around to the beginning of the group */