diff options
author | Bram Moolenaar <Bram@vim.org> | 2005-03-07 23:06:25 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2005-03-07 23:06:25 +0000 |
commit | fd91ecbbe05889d6d3bd266152373a90813ea3cf (patch) | |
tree | f8df0dadb3a54e8725b7dd09e0faada79b20753b | |
parent | 5ea7e8b730683572abfbb4961a9e9474e8fdf3e8 (diff) | |
download | vim-git-fd91ecbbe05889d6d3bd266152373a90813ea3cf.tar.gz |
updated for version 7.0057
-rw-r--r-- | src/gui.c | 31 |
1 files changed, 31 insertions, 0 deletions
@@ -543,6 +543,31 @@ gui_init() /* Now make sure the shell fits on the screen. */ gui_set_shellsize(FALSE, TRUE); #endif + +#ifdef FEAT_BEVAL + /* Always create the Balloon Evaluation area, but disable it when + * 'ballooneval' is off */ +# ifdef FEAT_GUI_GTK + balloonEval = gui_mch_create_beval_area(gui.drawarea, NULL, + &general_beval_cb, NULL); +# else +# ifdef FEAT_GUI_MOTIF + { + extern Widget textArea; + balloonEval = gui_mch_create_beval_area(textArea, NULL, + &general_beval_cb, NULL); + } +# else +# ifdef FEAT_GUI_W32 + balloonEval = gui_mch_create_beval_area(NULL, NULL, + &general_beval_cb, NULL); +# endif +# endif +# endif + if (!p_beval) + gui_mch_disable_beval_area(balloonEval); +#endif + #ifdef FEAT_NETBEANS_INTG if (starting == 0 && usingNetbeans) /* Tell the client that it can start sending commands. */ @@ -2197,8 +2222,14 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back) /* Draw a composing char on top of the previous char. */ if (comping) { +# if !defined(__APPLE_CC__) && !defined(__MRC__) && !defined(TARGET_API_MAC_CARBON) gui_mch_draw_string(gui.row, scol - cn, s + i, cl, draw_flags | DRAW_TRANSP); +# else + /* Carbon ATSUI autodraws composing char over previous char */ + gui_mch_draw_string(gui.row, scol, s + i, cl, + draw_flags | DRAW_TRANSP); +# endif start = i + cl; } } |