summaryrefslogtreecommitdiffstats
path: root/src/gui_w48.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-04-07 21:33:12 +0000
committerBram Moolenaar <Bram@vim.org>2006-04-07 21:33:12 +0000
commit5555acc08e6f49afe00cbb8fefd687cb526a7cf2 (patch)
treed69b430164cd7a178e597fc07741c4d4a3d825be /src/gui_w48.c
parent7b89edc62ddb12b74276567087f58fc015c1f8a0 (diff)
updated for version 7.0c12
Diffstat (limited to 'src/gui_w48.c')
-rw-r--r--src/gui_w48.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gui_w48.c b/src/gui_w48.c
index 0f6cb7b1a0..b940a27351 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -1114,22 +1114,19 @@ gui_mch_set_text_area_pos(int x, int y, int w, int h)
#ifdef FEAT_TOOLBAR
if (vim_strchr(p_go, GO_TOOLBAR) != NULL)
SendMessage(s_toolbarhwnd, WM_SIZE,
- (WPARAM)0, (LPARAM)(w + ((long)(TOOLBAR_BUTTON_HEIGHT+8)<<16)));
+ (WPARAM)0, (LPARAM)(w + ((long)(TOOLBAR_BUTTON_HEIGHT+8)<<16)));
#endif
#if defined(FEAT_GUI_TABLINE)
if (showing_tabline)
{
int top = 0;
- RECT rect;
#ifdef FEAT_TOOLBAR
if (vim_strchr(p_go, GO_TOOLBAR) != NULL)
top = TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT;
#endif
-
- SetRect(&rect, 0, top, w, TABLINE_HEIGHT);
- TabCtrl_AdjustRect(s_tabhwnd, TRUE, &rect);
- MoveWindow(s_tabhwnd, 0, top, rect.right, rect.bottom, TRUE);
+ GetClientRect(s_hwnd, &rect);
+ MoveWindow(s_tabhwnd, 0, top, rect.right, TABLINE_HEIGHT, TRUE);
}
#endif
@@ -1460,7 +1457,7 @@ gui_mch_get_color(char_u *name)
if (fname == NULL)
return INVALCOLOR;
- fd = fopen((char *)fname, "rt");
+ fd = mch_fopen((char *)fname, "rt");
vim_free(fname);
if (fd == NULL)
return INVALCOLOR;