comparison src/gui_w32.c @ 8138:f52504c10387 v7.4.1363

commit https://github.com/vim/vim/commit/065bbac8adfe29a09958570237d223457f235c6c Author: Bram Moolenaar <Bram@vim.org> Date: Sat Feb 20 13:08:46 2016 +0100 patch 7.4.1363 Problem: Compiler warnings with tiny build. Solution: Add #ifdefs.
author Christian Brabandt <cb@256bit.org>
date Sat, 20 Feb 2016 13:15:04 +0100
parents 50515f2e81d1
children 563c923b1584
comparison
equal deleted inserted replaced
8137:e5f3abc284b1 8138:f52504c10387
32 #if defined(FEAT_DIRECTX) 32 #if defined(FEAT_DIRECTX)
33 static DWriteContext *s_dwc = NULL; 33 static DWriteContext *s_dwc = NULL;
34 static int s_directx_enabled = 0; 34 static int s_directx_enabled = 0;
35 static int s_directx_load_attempted = 0; 35 static int s_directx_load_attempted = 0;
36 # define IS_ENABLE_DIRECTX() (s_directx_enabled && s_dwc != NULL) 36 # define IS_ENABLE_DIRECTX() (s_directx_enabled && s_dwc != NULL)
37 #endif
38
39 #ifdef FEAT_MENU
40 static int gui_mswin_get_menu_height(int fix_window);
37 #endif 41 #endif
38 42
39 #if defined(FEAT_DIRECTX) || defined(PROTO) 43 #if defined(FEAT_DIRECTX) || defined(PROTO)
40 int 44 int
41 directx_enabled(void) 45 directx_enabled(void)
456 460
457 /* 461 /*
458 * stuff for dialogs, menus, tearoffs etc. 462 * stuff for dialogs, menus, tearoffs etc.
459 */ 463 */
460 static LRESULT APIENTRY dialog_callback(HWND, UINT, WPARAM, LPARAM); 464 static LRESULT APIENTRY dialog_callback(HWND, UINT, WPARAM, LPARAM);
465 #ifdef FEAT_TEAROFF
461 static LRESULT APIENTRY tearoff_callback(HWND, UINT, WPARAM, LPARAM); 466 static LRESULT APIENTRY tearoff_callback(HWND, UINT, WPARAM, LPARAM);
467 #endif
462 static PWORD 468 static PWORD
463 add_dialog_element( 469 add_dialog_element(
464 PWORD p, 470 PWORD p,
465 DWORD lStyle, 471 DWORD lStyle,
466 WORD x, 472 WORD x,
470 WORD Id, 476 WORD Id,
471 WORD clss, 477 WORD clss,
472 const char *caption); 478 const char *caption);
473 static LPWORD lpwAlign(LPWORD); 479 static LPWORD lpwAlign(LPWORD);
474 static int nCopyAnsiToWideChar(LPWORD, LPSTR); 480 static int nCopyAnsiToWideChar(LPWORD, LPSTR);
481 #if defined(FEAT_MENU) && defined(FEAT_TEAROFF)
475 static void gui_mch_tearoff(char_u *title, vimmenu_T *menu, int initX, int initY); 482 static void gui_mch_tearoff(char_u *title, vimmenu_T *menu, int initX, int initY);
483 #endif
476 static void get_dialog_font_metrics(void); 484 static void get_dialog_font_metrics(void);
477 485
478 static int dialog_default_button = -1; 486 static int dialog_default_button = -1;
479 487
480 /* Intellimouse support */ 488 /* Intellimouse support */