Changeset 2214 for trunk/src

Timestamp:

Dec 27, 1999, 7:43:42 PM (26 years ago)

Author:

sandervl

Message:

VT's codepage changes + combo bugfixes

Location:

trunk/src/user32

Files:

• combo.cpp (modified) (3 diffs)
• pmwindow.cpp (modified) (3 diffs)

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.20 1999-12-21 17:03:43 cbratschi Exp $ */
+/* $Id: combo.cpp,v 1.21 1999-12-27 18:43:41 sandervl Exp $ */
 /*
  * Combo controls
@@ -1272 +1272 @@
    LPHEADCOMBO lphc = (LPHEADCOMBO)GetInfoPtr(hwnd);
 
-   if ( lphc->wState & CBF_EDIT && lphc->hWndEdit == hwnd )
+   if ( lphc->wState & CBF_EDIT && lphc->hWndEdit == lParam )
    {
        /* ">> 8" makes gcc generate jump-table instead of cmp ladder */
@@ -1329 +1329 @@
        }
    }
-   else if( lphc->hWndLBox == hwnd )
+   else if( lphc->hWndLBox == lParam )
    {
        switch( HIWORD(wParam) )

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.71 1999-12-27 14:41:42 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.72 1999-12-27 18:43:42 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -36 +36 @@
 #include "caret.h"
 #include "timer.h"
+#include <codepage.h>
 
 HMQ  hmq = 0;                             /* Message queue handle         */
@@ -84 +85 @@
   dprintf(("InitPM: hmq = %x", hmq));
   SetThreadMessageQueue(hmq);
+
+  BOOL rc = WinSetCp(hmq, GetDisplayCodepage());
+  dprintf(("InitPM: WinSetCP was %sOK", rc ? "" : "not "));
 
   if(!WinRegisterClass(                 /* Register window class        */