Mercurial > emacs
annotate admin/nt/dump.bat @ 109581:06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
* lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left)
(menu-bar-showhide-tool-bar-menu-customize-disable)
(menu-bar-showhide-tool-bar-menu-customize-enable-right)
(menu-bar-showhide-tool-bar-menu-customize-enable-top)
(menu-bar-showhide-tool-bar-menu-customize-enable-bottom): New functions
(menu-bar-showhide-tool-bar-menu): If tool bar is moveable,
make a menu for Options => toolbar that can move it.
* src/frame.c (Qtool_bar_position): New variable.
(make_frame): Set tool_bar_position to Qtop.
(frame_parms): Add tool-bar-position.
(x_report_frame_params): Store tool_bar_position.
(x_set_fringe_width): Reset wm size hint after fringe changes.
* src/frame.h (struct frame): Add tool_bar_position.
(Qbottom): Declare.
* src/gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro.
(xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
(xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH.
(xg_create_frame_widgets): Create a hobox for placing widgets
vertically. Use gtk_box_pack_start.
(xg_height_or_width_changed): Renamed from xg_height_changed.
(x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width.
(xg_update_frame_menubar, free_frame_menubar): Change to
xg_height_or_width_changed.
(xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar
size correctly. Remove hardcoded 4, instead use handlebox size -
toolbar size.
(xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar
size correctly. Use handlebox size + toolbar size as additional
size.
(xg_pack_tool_bar): POS is a new parameter.
Set orientation of tool bar based on pos.
Only make handlebox_widget if NULL.
Check if tool bar goes to vbox or hbox depending on pos.
(xg_update_tool_bar_sizes): New function.
(update_frame_tool_bar): Remove old_req, new_req. Do not get tool bar
height, call xg_update_tool_bar_sizes instead.
(free_frame_tool_bar): Remove from hbox or vbox depending on
toolbar_in_hbox, Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero.
(xg_change_toolbar_position): New function.
* src/gtkutil.h (xg_change_toolbar_position): Declare.
* src/window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT
and FRAME_TOOLBAR_LEFT_WIDTH.
* src/xfns.c (x_set_tool_bar_position): New function.
(xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT.
(x_frame_parm_handlers): Add x_set_tool_bar_position.
(syms_of_xfns): if USE_GTK, provide move-toolbar.
* src/xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
* src/xterm.h (struct x_output): Add toolbar_top_height,
toolbar_bottom_height, toolbar_left_width, toolbar_right_width. Remove
toolbar_height.
if USE_GTK: Add hbox_widget and toolbar_in_hbox.
(FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT)
(FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros.
(FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 29 Jul 2010 18:49:59 +0200 |
| parents | c4c2d8a98a03 |
| children | ef719132ddfa |
| rev | line source |
|---|---|
|
39011
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
1 @echo off |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
2 rem Run temacs.exe to recreate the dumped emacs.exe. |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
3 rem This is only likely to be useful on systems where the prebuilt |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
4 rem emacs.exe crashes on startup. |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
5 |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
6 rem First save original emacs.exe if present |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
7 if exist emacs.exe.orig goto dump |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
8 echo Saving original emacs.exe as emacs.exe.orig |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
9 ren emacs.exe emacs.exe.orig |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
10 |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
11 :dump |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
12 rem Overwrites emacs.exe if still present |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
13 mkdir obj |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
14 mkdir obj\i386 |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
15 mkdir obj\etc |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
16 copy ..\etc\DOC* obj\etc |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
17 copy temacs.exe obj\i386 |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
18 obj\i386\temacs -batch -l loadup dump |
|
dc12250ba65b
add scripts for creating precompiled Windows distributions
Andrew Innes <andrewi@gnu.org>
parents:
diff
changeset
|
19 copy obj\i386\emacs.exe . |
|
97324
c4c2d8a98a03
* nt/dump.bat: Fix mixed EOLs.
Juanma Barranquero <lekktu@gmail.com>
parents:
77799
diff
changeset
|
20 |
|
c4c2d8a98a03
* nt/dump.bat: Fix mixed EOLs.
Juanma Barranquero <lekktu@gmail.com>
parents:
77799
diff
changeset
|
21 goto skipArchTag |
|
c4c2d8a98a03
* nt/dump.bat: Fix mixed EOLs.
Juanma Barranquero <lekktu@gmail.com>
parents:
77799
diff
changeset
|
22 arch-tag: 0ca3036d-3a1e-47ea-87c6-9c0845253496 |
|
c4c2d8a98a03
* nt/dump.bat: Fix mixed EOLs.
Juanma Barranquero <lekktu@gmail.com>
parents:
77799
diff
changeset
|
23 :skipArchTag |
