Commit 70385fe6 authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

(x_scroll_bar_create, XTread_socket): Replace #if

USE_TOOLKIT_SCROLL_BARS with #ifdef USE_TOOLKIT_SCROLL_BARS.
(x_set_window_size): Call SET_FRAME_GARBAGED.  Clear window if
internal border width has changed.
parent c6fe6289
...@@ -4963,7 +4963,7 @@ x_scroll_bar_create (w, top, left, width, height, disp_top, disp_height) ...@@ -4963,7 +4963,7 @@ x_scroll_bar_create (w, top, left, width, height, disp_top, disp_height)
#endif #endif
#if TARGET_API_MAC_CARBON #if TARGET_API_MAC_CARBON
ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p", ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p",
#if USE_TOOLKIT_SCROLL_BARS #ifdef USE_TOOLKIT_SCROLL_BARS
false, false,
#else #else
width < disp_height, width < disp_height,
...@@ -6223,6 +6223,16 @@ x_set_window_size (f, change_gravity, cols, rows) ...@@ -6223,6 +6223,16 @@ x_set_window_size (f, change_gravity, cols, rows)
#endif #endif
mac_handle_size_change (f, pixelwidth, pixelheight); mac_handle_size_change (f, pixelwidth, pixelheight);
if (f->output_data.mac->internal_border_width
!= FRAME_INTERNAL_BORDER_WIDTH (f))
{
mac_clear_window (f);
f->output_data.mac->internal_border_width
= FRAME_INTERNAL_BORDER_WIDTH (f);
}
SET_FRAME_GARBAGED (f);
UNBLOCK_INPUT; UNBLOCK_INPUT;
} }
...@@ -11045,7 +11055,7 @@ XTread_socket (sd, expected, hold_quit) ...@@ -11045,7 +11055,7 @@ XTread_socket (sd, expected, hold_quit)
else else
{ {
/* A window has been deactivated */ /* A window has been deactivated */
#if USE_TOOLKIT_SCROLL_BARS #ifdef USE_TOOLKIT_SCROLL_BARS
if (dpyinfo->grabbed && tracked_scroll_bar) if (dpyinfo->grabbed && tracked_scroll_bar)
{ {
struct input_event event; struct input_event event;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment