Mercurial > emacs
comparison src/frame.h @ 97043:9592c50233ab remove-carbon
Remove support for Mac Carbon.
* mactoolbox.c:
* macterm.h:
* macterm.c:
* macselect.c:
* macmenu.c:
* macgui.h:
* macfns.c:
* mac.c: Remove file.
* s/darwin.h:
* m/intel386.h:
* xfaces.c:
* xdisp.c:
* window.c:
* tparam.c:
* termhooks.h:
* termcap.c:
* term.c:
* syssignal.h:
* sysselect.h:
* sysdep.c:
* process.c:
* lread.c:
* lisp.h:
* keyboard.c:
* image.c:
* fringe.c:
* frame.h:
* frame.c:
* fontset.c:
* font.h:
* font.c:
* fns.c:
* fileio.c:
* emacs.c:
* dispnew.c:
* dispextern.h:
* config.in:
* atimer.c:
* Makefile.in: Remove code for Carbon
* erc.el: Remove code for Carbon.
Remove support for Mac Carbon.
* term/mac-win.el: Remove file
* international/mule-cmds.el:
* version.el:
* startup.el:
* simple.el:
* mwheel.el:
* mouse.el:
* loadup.el:
* isearch.el:
* info.el:
* frame.el:
* faces.el:
* disp-table.el:
* cus-start.el:
* cus-face.el:
* cus-edit.el:
* Makefile.in: Remove code for Carbon.
Remove support for Mac Carbon.
* makefile.w32-in:
* emacsclient.c: Remove code for Carbon.
* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.
* ns-emacs.texi:
* faq.texi: Remove mentions of Mac Carbon.
* os.texi:
* frames.texi:
* display.texi: Remove mentions of Mac Carbon.
* xresources.texi: Remove mentions of Mac Carbon.
* make-tarball.txt:
* admin.el:
* FOR-RELEASE:
* CPP-DEFINES: Remove mentions of Mac Carbon.
Remove support for Mac Carbon.
* mac: Remove directory.
* make-dist:
* configure.in:
* README:
* Makefile.in:
* INSTALL: Remove code for Carbon.
* configure: Regenerate.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sun, 27 Jul 2008 18:24:48 +0000 |
parents | 1e2f7aab70ba |
children | 840bd675fd85 |
comparison
equal
deleted
inserted
replaced
97042:0ac199626cb9 | 97043:9592c50233ab |
---|---|
243 | 243 |
244 /* Set to non-zero to minimize tool-bar height even when | 244 /* Set to non-zero to minimize tool-bar height even when |
245 auto-resize-tool-bar is set to grow-only. */ | 245 auto-resize-tool-bar is set to grow-only. */ |
246 unsigned minimize_tool_bar_window_p : 1; | 246 unsigned minimize_tool_bar_window_p : 1; |
247 | 247 |
248 #if defined (USE_GTK) || defined (HAVE_NS) || defined (MAC_OS) | 248 #if defined (USE_GTK) || defined (HAVE_NS) |
249 /* Nonzero means using a tool bar that comes from the toolkit. */ | 249 /* Nonzero means using a tool bar that comes from the toolkit. */ |
250 int external_tool_bar; | 250 int external_tool_bar; |
251 #endif | 251 #endif |
252 | 252 |
253 /* Margin at the top of the frame. Used to display the tool-bar. */ | 253 /* Margin at the top of the frame. Used to display the tool-bar. */ |
332 union output_data | 332 union output_data |
333 { | 333 { |
334 struct tty_output *tty; /* termchar.h */ | 334 struct tty_output *tty; /* termchar.h */ |
335 struct x_output *x; /* xterm.h */ | 335 struct x_output *x; /* xterm.h */ |
336 struct w32_output *w32; /* w32term.h */ | 336 struct w32_output *w32; /* w32term.h */ |
337 struct mac_output *mac; /* macterm.h */ | |
338 struct ns_output *ns; /* nsterm.h */ | 337 struct ns_output *ns; /* nsterm.h */ |
339 EMACS_INT nothing; | 338 EMACS_INT nothing; |
340 } | 339 } |
341 output_data; | 340 output_data; |
342 | 341 |
360 enum fullscreen_type want_fullscreen; | 359 enum fullscreen_type want_fullscreen; |
361 | 360 |
362 /* Number of lines of menu bar. */ | 361 /* Number of lines of menu bar. */ |
363 int menu_bar_lines; | 362 int menu_bar_lines; |
364 | 363 |
365 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) \ | 364 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \ |
366 || defined (HAVE_NS) || defined (USE_GTK) | 365 || defined (HAVE_NS) || defined (USE_GTK) |
367 /* Nonzero means using a menu bar that comes from the X toolkit. */ | 366 /* Nonzero means using a menu bar that comes from the X toolkit. */ |
368 unsigned int external_menu_bar : 1; | 367 unsigned int external_menu_bar : 1; |
369 #endif | 368 #endif |
370 | 369 |
532 #define FRAME_WINDOW_P(f) FRAME_X_P (f) | 531 #define FRAME_WINDOW_P(f) FRAME_X_P (f) |
533 #endif | 532 #endif |
534 #ifdef HAVE_NTGUI | 533 #ifdef HAVE_NTGUI |
535 #define FRAME_WINDOW_P(f) FRAME_W32_P (f) | 534 #define FRAME_WINDOW_P(f) FRAME_W32_P (f) |
536 #endif | 535 #endif |
537 #ifdef MAC_OS | |
538 #define FRAME_WINDOW_P(f) FRAME_MAC_P (f) | |
539 #endif | |
540 #ifdef HAVE_NS | 536 #ifdef HAVE_NS |
541 #define FRAME_WINDOW_P(f) FRAME_NS_P(f) | 537 #define FRAME_WINDOW_P(f) FRAME_NS_P(f) |
542 #endif | 538 #endif |
543 #ifndef FRAME_WINDOW_P | 539 #ifndef FRAME_WINDOW_P |
544 #define FRAME_WINDOW_P(f) (0) | 540 #define FRAME_WINDOW_P(f) (0) |
576 These lines are counted in FRAME_LINES. */ | 572 These lines are counted in FRAME_LINES. */ |
577 #define FRAME_MENU_BAR_LINES(f) (f)->menu_bar_lines | 573 #define FRAME_MENU_BAR_LINES(f) (f)->menu_bar_lines |
578 | 574 |
579 /* Nonzero if this frame should display a tool bar | 575 /* Nonzero if this frame should display a tool bar |
580 in a way that does not use any text lines. */ | 576 in a way that does not use any text lines. */ |
581 #if defined (USE_GTK) || defined (HAVE_NS) || defined (MAC_OS) | 577 #if defined (USE_GTK) || defined (HAVE_NS) |
582 #define FRAME_EXTERNAL_TOOL_BAR(f) (f)->external_tool_bar | 578 #define FRAME_EXTERNAL_TOOL_BAR(f) (f)->external_tool_bar |
583 #else | 579 #else |
584 #define FRAME_EXTERNAL_TOOL_BAR(f) 0 | 580 #define FRAME_EXTERNAL_TOOL_BAR(f) 0 |
585 #endif | 581 #endif |
586 | 582 |
594 #define FRAME_TOP_MARGIN(F) \ | 590 #define FRAME_TOP_MARGIN(F) \ |
595 (FRAME_MENU_BAR_LINES (F) + FRAME_TOOL_BAR_LINES (F)) | 591 (FRAME_MENU_BAR_LINES (F) + FRAME_TOOL_BAR_LINES (F)) |
596 | 592 |
597 /* Nonzero if this frame should display a menu bar | 593 /* Nonzero if this frame should display a menu bar |
598 in a way that does not use any text lines. */ | 594 in a way that does not use any text lines. */ |
599 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) \ | 595 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \ |
600 || defined (HAVE_NS) || defined (USE_GTK) | 596 || defined (HAVE_NS) || defined (USE_GTK) |
601 #define FRAME_EXTERNAL_MENU_BAR(f) (f)->external_menu_bar | 597 #define FRAME_EXTERNAL_MENU_BAR(f) (f)->external_menu_bar |
602 #else | 598 #else |
603 #define FRAME_EXTERNAL_MENU_BAR(f) 0 | 599 #define FRAME_EXTERNAL_MENU_BAR(f) 0 |
604 #endif | 600 #endif |