Changeset 1960 for trunk/src

Timestamp:

Dec 3, 1999, 6:30:17 PM (26 years ago)

Author:

cbratschi

Message:

scroll: removed WS_* check

Location:

trunk/src/user32

Files:

• edit.cpp (modified) (5 diffs)
• scroll.cpp (modified) (2 diffs)

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.21 1999-12-02 16:34:43 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.22 1999-12-03 17:30:15 cbratschi Exp $ */
 /*
  *      Edit control
@@ -17 +17 @@
 /* CB: todo
   - EN_ALIGN_LTR_EC, EN_ALIGN_RTL_EC -> undocumented notifications
-  - EM_SETIMESTATUS, EM_GETITEMSTATUS -> undocumented messages
   - text alignment for single and multi line (ES_LEFT, ES_RIGHT, ES_CENTER)
     new in Win98, Win2k: for single line too
@@ -226 +225 @@
 static void     EDIT_EM_SetWordBreakProc(HWND hwnd, EDITSTATE *es, EDITWORDBREAKPROCA wbp);
 static BOOL     EDIT_EM_Undo(HWND hwnd, EDITSTATE *es);
-static LRESULT  EDIT_EM_SetImeStatus(HWND hwnd,EDITSTATE *es,WPARAM wParam,LPARAM lParam);
-static LRESULT  EDIT_EM_GetImeStatus(HWND hwnd,EDITSTATE *es,WPARAM wParam,LPARAM lParam);
+static LRESULT  EDIT_EM_SetIMEStatus(HWND hwnd,EDITSTATE *es,WPARAM wParam,LPARAM lParam);
+static LRESULT  EDIT_EM_GetIMEStatus(HWND hwnd,EDITSTATE *es,WPARAM wParam,LPARAM lParam);
 /*
  *      WM_XXX message handlers
@@ -576 +575 @@
 
         case EM_SETIMESTATUS:
-                result = EDIT_EM_SetImeStatus(hwnd,es,wParam,lParam);
+                result = EDIT_EM_SetIMEStatus(hwnd,es,wParam,lParam);
                 break;
 
         case EM_GETIMESTATUS:
-                result = EDIT_EM_GetImeStatus(hwnd,es,wParam,lParam);
+                result = EDIT_EM_GetIMEStatus(hwnd,es,wParam,lParam);
                 break;
 
@@ -2789 +2788 @@
 }
 
-static LRESULT EDIT_EM_SetImeStatus(HWND hwnd,EDITSTATE *es,WPARAM wParam,LPARAM lParam)
-{
-  //CB: undocumented!
+static LRESULT EDIT_EM_SetIMEStatus(HWND hwnd,EDITSTATE *es,WPARAM wParam,LPARAM lParam)
+{
+  if (wParam == EMSIS_COMPOSITIONSTRING)
+  {
+    //CB: todo
+  }
 
   return 0;
 }
 
-static LRESULT EDIT_EM_GetImeStatus(HWND hwnd,EDITSTATE *es,WPARAM wParam,LPARAM lParam)
-{
-  //CB: undocumented!
-
-  return 0;
+static LRESULT EDIT_EM_GetIMEStatus(HWND hwnd,EDITSTATE *es,WPARAM wParam,LPARAM lParam)
+{
+  //CB: todo
+
+  return 0; //default
 }
 

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.26 1999-12-01 18:23:28 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.27 1999-12-03 17:30:17 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -85 +85 @@
 
         if (!win32wnd) return 0;
+//CB: I removed WS_* check due to problems, but it should work
         if (nBar == SB_HORZ)
-          return  (win32wnd->getStyle() & WS_HSCROLL) ? Win32BaseWindow::OS2ToWin32Handle(win32wnd->getHorzScrollHandle()):0;
+          return /*(win32wnd->getStyle() & WS_HSCROLL) ?*/ Win32BaseWindow::OS2ToWin32Handle(win32wnd->getHorzScrollHandle())/*:0*/;
         else
-          return (win32wnd->getStyle() & WS_VSCROLL) ? Win32BaseWindow::OS2ToWin32Handle(win32wnd->getVertScrollHandle()):0;
+          return /*(win32wnd->getStyle() & WS_VSCROLL) ?*/ Win32BaseWindow::OS2ToWin32Handle(win32wnd->getVertScrollHandle())/*:0*/;
       }