summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Allsopp <david.allsopp@metastack.com>2018-02-24 10:56:18 +0000
committerXavier Leroy <xavierleroy@users.noreply.github.com>2018-02-24 11:56:18 +0100
commitb2d0255d616d7d19620f8860eceded080185db4b (patch)
treed84676ed1294ce2490c16542cdd5c6ba6a852250
parent2d6ed01bd89099e93b3a8dd7cad941156f70bce5 (diff)
downloadocaml-b2d0255d616d7d19620f8860eceded080185db4b.tar.gz
Fix Unicode mismatch in win32graph (#1629)
The window class is created using RegisterClassA, which means that the default window procedure should be DefWindowProcA.
-rw-r--r--Changes4
-rw-r--r--otherlibs/win32graph/open.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/Changes b/Changes
index b0bd928261..59c5dceb84 100644
--- a/Changes
+++ b/Changes
@@ -44,6 +44,10 @@ Working version
### Other libraries:
+- MPR#7445, GPR#1629: Graphics.open_graph displays the correct window title on
+ Windows again (fault introduced by 4.06 Unicode changes).
+ (David Allsopp)
+
* GPR#1406: Unix.isatty now returns true in the native Windows ports when
passed a file descriptor connected to a Cygwin PTY. In particular, compiler
colors for the native Windows ports now work under Cygwin/MSYS2.
diff --git a/otherlibs/win32graph/open.c b/otherlibs/win32graph/open.c
index e5e988d153..d1db56e02f 100644
--- a/otherlibs/win32graph/open.c
+++ b/otherlibs/win32graph/open.c
@@ -107,7 +107,7 @@ static LRESULT CALLBACK GraphicsWndProc(HWND hwnd,UINT msg,WPARAM wParam,
break;
}
caml_gr_handle_event(msg, wParam, lParam);
- return DefWindowProc(hwnd, msg, wParam, lParam);
+ return DefWindowProcA(hwnd, msg, wParam, lParam);
}
int DoRegisterClass(void)