diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-09 08:52:57 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-09 08:52:57 +0000 |
| commit | 1af74d06e5bdafad9d629d2ed729c5d743cfaf0f (patch) | |
| tree | 0360965ec0ad2736ffee01cce4f040c6b0a99133 /lib-src | |
| parent | eceb3266a1f66a0034954aa82efbb20a5be959f8 (diff) | |
| parent | 4b70e299ef66906fd285198003c72a1439d1f252 (diff) | |
| download | emacs-1af74d06e5bdafad9d629d2ed729c5d743cfaf0f.tar.gz emacs-1af74d06e5bdafad9d629d2ed729c5d743cfaf0f.tar.bz2 emacs-1af74d06e5bdafad9d629d2ed729c5d743cfaf0f.zip | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 11 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 4 |
3 files changed, 16 insertions, 5 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c5f999666a6..bec78315e45 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2007-09-27 Jason Rumney <jasonr@gnu.org> + + * makefile.w32-in (emacsclient, emacsclientw): Link to COMCTL32. + + * emacsclient.c (w32_window_app): Init common controls when windowed. + 2007-09-21 Glenn Morris <rgm@gnu.org> * emacstool.c: Remove file. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 02935941b02..02b70a39802 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -35,6 +35,7 @@ Boston, MA 02110-1301, USA. */ # include <malloc.h> # include <stdlib.h> # include <windows.h> +# include <commctrl.h> # define NO_SOCKETS_IN_FILE_SYSTEM @@ -300,9 +301,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; } diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index bd44130135c..07be340c2bd 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -82,11 +82,11 @@ $(TRES): ../nt/emacs.rc $(BLD)/emacsclient.exe: $(ECLIENTOBJS) # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib - $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(LIBS) + $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) $(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(TRES) # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib - $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(LIBS) + $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) # emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in # can be edited to define VERSION string, which is part of ECLIENT_CFLAGS. |