diff options
| author | Jason Rumney | 2007-09-27 22:10:53 +0000 |
|---|---|---|
| committer | Jason Rumney | 2007-09-27 22:10:53 +0000 |
| commit | 60860eb36d45e00509fd97c167ee4e9fbb5b7ac6 (patch) | |
| tree | af8274fe4ffa23c9b41bf934d043b4c8ba144264 | |
| parent | cbcb463b3cb74fd06ddbfac949fa6329e5d0d082 (diff) | |
| download | emacs-60860eb36d45e00509fd97c167ee4e9fbb5b7ac6.tar.gz emacs-60860eb36d45e00509fd97c167ee4e9fbb5b7ac6.zip | |
(globals_of_w32fns): Init common controls.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/w32fns.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3875f081c8b..cbba8f5d3d5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2007-09-27 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in (LIBS): Add COMCTL32. | ||
| 4 | |||
| 5 | * w32fns.c (globals_of_w32fns): Init common controls. | ||
| 6 | |||
| 1 | 2007-09-21 Richard Stallman <rms@gnu.org> | 7 | 2007-09-21 Richard Stallman <rms@gnu.org> |
| 2 | 8 | ||
| 3 | * image.c (our_memory_buffer): Renamed from omfib_buffer. | 9 | * image.c (our_memory_buffer): Renamed from omfib_buffer. |
diff --git a/src/w32fns.c b/src/w32fns.c index be3570231dc..d260b0d9be9 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -48,6 +48,7 @@ Boston, MA 02110-1301, USA. */ | |||
| 48 | 48 | ||
| 49 | #include "bitmaps/gray.xbm" | 49 | #include "bitmaps/gray.xbm" |
| 50 | 50 | ||
| 51 | #include <commctrl.h> | ||
| 51 | #include <commdlg.h> | 52 | #include <commdlg.h> |
| 52 | #include <shellapi.h> | 53 | #include <shellapi.h> |
| 53 | #include <ctype.h> | 54 | #include <ctype.h> |
| @@ -9073,6 +9074,9 @@ void globals_of_w32fns () | |||
| 9073 | &w32_ansi_code_page, | 9074 | &w32_ansi_code_page, |
| 9074 | doc: /* The ANSI code page used by the system. */); | 9075 | doc: /* The ANSI code page used by the system. */); |
| 9075 | w32_ansi_code_page = GetACP (); | 9076 | w32_ansi_code_page = GetACP (); |
| 9077 | |||
| 9078 | /* MessageBox does not work without this when linked to comctl32.dll 6.0. */ | ||
| 9079 | InitCommonControls (); | ||
| 9076 | } | 9080 | } |
| 9077 | 9081 | ||
| 9078 | #undef abort | 9082 | #undef abort |