comparison src/gui.c @ 187:c757ec217a09

updated for version 7.0057
author vimboss
date Mon, 07 Mar 2005 23:06:25 +0000
parents 8c60f65311fa
children 3b32f6b507fa
comparison
equal deleted inserted replaced
186:5f559eb69ed8 187:c757ec217a09
541 /* Give GTK+ a chance to put all widget's into place. */ 541 /* Give GTK+ a chance to put all widget's into place. */
542 gui_mch_update(); 542 gui_mch_update();
543 /* Now make sure the shell fits on the screen. */ 543 /* Now make sure the shell fits on the screen. */
544 gui_set_shellsize(FALSE, TRUE); 544 gui_set_shellsize(FALSE, TRUE);
545 #endif 545 #endif
546
547 #ifdef FEAT_BEVAL
548 /* Always create the Balloon Evaluation area, but disable it when
549 * 'ballooneval' is off */
550 # ifdef FEAT_GUI_GTK
551 balloonEval = gui_mch_create_beval_area(gui.drawarea, NULL,
552 &general_beval_cb, NULL);
553 # else
554 # ifdef FEAT_GUI_MOTIF
555 {
556 extern Widget textArea;
557 balloonEval = gui_mch_create_beval_area(textArea, NULL,
558 &general_beval_cb, NULL);
559 }
560 # else
561 # ifdef FEAT_GUI_W32
562 balloonEval = gui_mch_create_beval_area(NULL, NULL,
563 &general_beval_cb, NULL);
564 # endif
565 # endif
566 # endif
567 if (!p_beval)
568 gui_mch_disable_beval_area(balloonEval);
569 #endif
570
546 #ifdef FEAT_NETBEANS_INTG 571 #ifdef FEAT_NETBEANS_INTG
547 if (starting == 0 && usingNetbeans) 572 if (starting == 0 && usingNetbeans)
548 /* Tell the client that it can start sending commands. */ 573 /* Tell the client that it can start sending commands. */
549 netbeans_startup_done(); 574 netbeans_startup_done();
550 #endif 575 #endif
2195 # endif 2220 # endif
2196 } 2221 }
2197 /* Draw a composing char on top of the previous char. */ 2222 /* Draw a composing char on top of the previous char. */
2198 if (comping) 2223 if (comping)
2199 { 2224 {
2225 # if !defined(__APPLE_CC__) && !defined(__MRC__) && !defined(TARGET_API_MAC_CARBON)
2200 gui_mch_draw_string(gui.row, scol - cn, s + i, cl, 2226 gui_mch_draw_string(gui.row, scol - cn, s + i, cl,
2201 draw_flags | DRAW_TRANSP); 2227 draw_flags | DRAW_TRANSP);
2228 # else
2229 /* Carbon ATSUI autodraws composing char over previous char */
2230 gui_mch_draw_string(gui.row, scol, s + i, cl,
2231 draw_flags | DRAW_TRANSP);
2232 # endif
2202 start = i + cl; 2233 start = i + cl;
2203 } 2234 }
2204 } 2235 }
2205 /* The stuff below assumes "len" is the length in screen columns. */ 2236 /* The stuff below assumes "len" is the length in screen columns. */
2206 len = scol - col; 2237 len = scol - col;