From dbf60b0750ca6df0558bf7e678f20109be29397d Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Thu, 27 Sep 2007 22:08:59 +0000 Subject: [PATCH] (w32_window_app): Init common controls when windowed. --- lib-src/ChangeLog | 6 ++++++ lib-src/emacsclient.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index fca9e1c2e6..a09ba2c078 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2007-09-27 Jason Rumney + + * makefile.w32-in (emacsclient, emacsclientw): Link to COMCTL32. + + * emacsclient.c (w32_window_app): Init common controls when windowed. + 2007-08-25 Eli Zaretskii * Makefile.in (rcs2log, rcs-checkin, grep-changelog, vcdiff): diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 9edba13213..c7f0bcf561 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -35,6 +35,7 @@ Boston, MA 02110-1301, USA. */ # include # include # include +# include # define NO_SOCKETS_IN_FILE_SYSTEM @@ -159,9 +160,13 @@ w32_window_app () char szTitle[MAX_PATH]; if (window_app < 0) - /* Checking for STDOUT does not work; it's a valid handle also in - nonconsole apps. Testing for the console title seems to work. */ - window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0); + { + /* Checking for STDOUT does not work; it's a valid handle also in + nonconsole apps. Testing for the console title seems to work. */ + window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0); + if (window_app) + InitCommonControls(); + } return window_app; } -- 2.20.1