Changeset 500 for trunk/src/user32/new/edit.cpp

Timestamp:

Aug 15, 1999, 9:11:02 PM (26 years ago)

Author:

cbratschi

Message:

wine-990731 update

File:

• trunk/src/user32/new/edit.cpp (modified) (7 diffs)

trunk/src/user32/new/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.2 1999-07-25 16:31:44 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.3 1999-08-15 19:11:00 cbratschi Exp $ */
 /*
  *      Edit control
@@ -17 +17 @@
  */
 
-//#include "config.h"
 #include "winuser.h"
 #include "winbase.h"
 #include <string.h>
-//#include "winnt.h"
-//#include "win.h"
-//#include "wine/winbase16.h"
 #include "controls.h"
 #include "combo.h"
-//#include "local.h"
-//#include "resource.h"
-//#include "debugtools.h"
-//#include "callback.h"
-//#include "tweak.h"
 
 #define BUFLIMIT_MULTI          65534   /* maximum buffer size (not including '\0')
@@ -98 +89 @@
         INT line_count;         /* number of lines */
         INT y_offset;                   /* scroll offset in number of lines */
+        BOOL bCaptureState; /* flag indicating whether mouse was captured */
         /*
          *      only for multi line controls
@@ -3156 +3148 @@
                 return 0;
 
+        es->bCaptureState = TRUE;
         SetCapture(hwnd);
         EDIT_ConfinePoint(hwnd, es, &x, &y);
@@ -3174 +3167 @@
 static LRESULT EDIT_WM_LButtonUp(HWND hwnd, EDITSTATE *es, DWORD keys, INT x, INT y)
 {
-        if (GetCapture() == hwnd) {
-                KillTimer(hwnd, 0);
-                ReleaseCapture();
-        }
-        return 0;
+        if (es->bCaptureState && GetCapture() == hwnd) {
+                KillTimer(hwnd, 0);
+                ReleaseCapture();
+        }
+        es->bCaptureState = FALSE;
+
+        return 0;
 }
 
@@ -3233 +3228 @@
         es->style = cs->style;
 
-        if ((es->style & WS_BORDER) && !(es->style & WS_DLGFRAME))
-                SetWindowLongA(hwnd,GWL_STYLE,GetWindowLongA(hwnd,GWL_STYLE) & ~WS_BORDER);
-
+
+        /*
+         * In Win95 look and feel, the WS_BORDER style is replaced by the
+         * WS_EX_CLIENTEDGE style for the edit control. This gives the edit
+         * control a non client area.
+         */
+        if (es->style & WS_BORDER)
+        {
+          es->style      &= ~WS_BORDER;
+          SetWindowLongA(hwnd,GWL_STYLE,GetWindowLongA(hwnd,GWL_STYLE) & ~WS_BORDER);
+          SetWindowLongA(hwnd,GWL_EXSTYLE,GetWindowLongA(hwnd,GWL_EXSTYLE) | WS_EX_CLIENTEDGE);
+        }
+        
         if (es->style & ES_MULTILINE) {
                 es->buffer_size = BUFSTART_MULTI;
@@ -3316 +3321 @@
                         if(es->style & WS_VSCROLL) rc.right++;
                 }
-                DrawEdge(dc, &rc, EDGE_SUNKEN, BF_RECT);
+                Rectangle(dc, rc.left, rc.top, rc.right, rc.bottom);
         }
         IntersectClipRect(dc, es->format_rect.left,