/[emacs]/emacs/src/macfns.c
ViewVC logotype

Diff of /emacs/src/macfns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.68 by mituharu, Sat Oct 1 11:09:09 2005 UTC revision 1.69 by mituharu, Sun Oct 16 02:22:35 2005 UTC
# Line 1745  x_set_tool_bar_lines (f, value, oldval) Line 1745  x_set_tool_bar_lines (f, value, oldval)
1745        int y = nlines * FRAME_LINE_HEIGHT (f);        int y = nlines * FRAME_LINE_HEIGHT (f);
1746    
1747        BLOCK_INPUT;        BLOCK_INPUT;
1748        XClearArea (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f),        mac_clear_area (f, 0, y, width, height);
                     0, y, width, height, 0);  
1749        UNBLOCK_INPUT;        UNBLOCK_INPUT;
1750    
1751        if (WINDOWP (f->tool_bar_window))        if (WINDOWP (f->tool_bar_window))
# Line 2439  This function is an internal primitive-- Line 2438  This function is an internal primitive--
2438    frame = Qnil;    frame = Qnil;
2439    GCPRO4 (parms, parent, name, frame);    GCPRO4 (parms, parent, name, frame);
2440    tem = mac_get_arg (parms, Qminibuffer, "minibuffer", "Minibuffer",    tem = mac_get_arg (parms, Qminibuffer, "minibuffer", "Minibuffer",
2441                       RES_TYPE_SYMBOL);                       RES_TYPE_SYMBOL);
2442    if (EQ (tem, Qnone) || NILP (tem))    if (EQ (tem, Qnone) || NILP (tem))
2443      f = make_frame_without_minibuffer (Qnil, kb, display);      f = make_frame_without_minibuffer (Qnil, kb, display);
2444    else if (EQ (tem, Qonly))    else if (EQ (tem, Qonly))
# Line 2480  This function is an internal primitive-- Line 2479  This function is an internal primitive--
2479    if (! STRINGP (f->icon_name))    if (! STRINGP (f->icon_name))
2480      f->icon_name = Qnil;      f->icon_name = Qnil;
2481    
2482  /*  FRAME_W32_DISPLAY_INFO (f) = dpyinfo; */  /*   FRAME_MAC_DISPLAY_INFO (f) = dpyinfo; */
2483    #if GLYPH_DEBUG
2484      image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
2485      dpyinfo_refcount = dpyinfo->reference_count;
2486    #endif /* GLYPH_DEBUG */
2487  #ifdef MULTI_KBOARD  #ifdef MULTI_KBOARD
2488    FRAME_KBOARD (f) = kb;    FRAME_KBOARD (f) = kb;
2489  #endif  #endif
# Line 2606  This function is an internal primitive-- Line 2609  This function is an internal primitive--
2609    x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),    x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
2610                         "menuBar", "MenuBar", RES_TYPE_NUMBER);                         "menuBar", "MenuBar", RES_TYPE_NUMBER);
2611    x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),    x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
2612                         "toolBar", "ToolBar", RES_TYPE_NUMBER);                         "toolBar", "ToolBar", RES_TYPE_NUMBER);
2613    x_default_parameter (f, parms, Qbuffer_predicate, Qnil,    x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
2614                         "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL);                         "bufferPredicate", "BufferPredicate",
2615                           RES_TYPE_SYMBOL);
2616    x_default_parameter (f, parms, Qtitle, Qnil,    x_default_parameter (f, parms, Qtitle, Qnil,
2617                         "title", "Title", RES_TYPE_STRING);                         "title", "Title", RES_TYPE_STRING);
2618    x_default_parameter (f, parms, Qfullscreen, Qnil,    x_default_parameter (f, parms, Qfullscreen, Qnil,
# Line 3593  x_create_tip_frame (dpyinfo, parms, text Line 3597  x_create_tip_frame (dpyinfo, parms, text
3597    
3598    FRAME_FONTSET (f)  = -1;    FRAME_FONTSET (f)  = -1;
3599    f->icon_name = Qnil;    f->icon_name = Qnil;
3600    /*   FRAME_X_DISPLAY_INFO (f) = dpyinfo; */
3601  #if GLYPH_DEBUG  #if GLYPH_DEBUG
3602    image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;    image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
3603    dpyinfo_refcount = dpyinfo->reference_count;    dpyinfo_refcount = dpyinfo->reference_count;
# Line 4047  Text larger than the specified size is c Line 4051  Text larger than the specified size is c
4051    BringToFront (FRAME_MAC_WINDOW (f));    BringToFront (FRAME_MAC_WINDOW (f));
4052    UNBLOCK_INPUT;    UNBLOCK_INPUT;
4053    
4054      FRAME_PIXEL_WIDTH (f) = width;
4055      FRAME_PIXEL_HEIGHT (f) = height;
4056    
4057    /* Draw into the window.  */    /* Draw into the window.  */
4058    w->must_be_updated_p = 1;    w->must_be_updated_p = 1;
4059    update_single_window (w, 1);    update_single_window (w, 1);

Legend:
Removed from v.1.68  
changed lines
  Added in v.1.69

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26