mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
updated for version 7.0030
This commit is contained in:
parent
2317284d1b
commit
c83c455ee7
@ -1218,10 +1218,6 @@ gui_resize_shell(pixel_width, pixel_height)
|
|||||||
again:
|
again:
|
||||||
busy = TRUE;
|
busy = TRUE;
|
||||||
|
|
||||||
#ifdef FEAT_GUI_BEOS
|
|
||||||
vim_lock_screen();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Flush pending output before redrawing */
|
/* Flush pending output before redrawing */
|
||||||
out_flush();
|
out_flush();
|
||||||
|
|
||||||
@ -1248,10 +1244,6 @@ again:
|
|||||||
|| gui.num_rows != Rows || gui.num_cols != Columns)
|
|| gui.num_rows != Rows || gui.num_cols != Columns)
|
||||||
shell_resized();
|
shell_resized();
|
||||||
|
|
||||||
#ifdef FEAT_GUI_BEOS
|
|
||||||
vim_unlock_screen();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
gui_update_scrollbars(TRUE);
|
gui_update_scrollbars(TRUE);
|
||||||
gui_update_cursor(FALSE, TRUE);
|
gui_update_cursor(FALSE, TRUE);
|
||||||
#if defined(FEAT_XIM) && !defined(HAVE_GTK2)
|
#if defined(FEAT_XIM) && !defined(HAVE_GTK2)
|
||||||
|
27
src/gui.h
27
src/gui.h
@ -11,10 +11,6 @@
|
|||||||
/* #define D(x) printf x; */
|
/* #define D(x) printf x; */
|
||||||
#define D(x)
|
#define D(x)
|
||||||
|
|
||||||
#if defined(FEAT_GUI_AMIGA)
|
|
||||||
# include <intuition/intuition.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef FEAT_GUI_MOTIF
|
#ifdef FEAT_GUI_MOTIF
|
||||||
# define FEAT_GUI_X11
|
# define FEAT_GUI_X11
|
||||||
# include <Xm/Xm.h>
|
# include <Xm/Xm.h>
|
||||||
@ -52,10 +48,6 @@ class VimWidget;
|
|||||||
# include <gtk/gtk.h>
|
# include <gtk/gtk.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef FEAT_GUI_BEOS
|
|
||||||
# include "gui_beos.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef FEAT_GUI_MAC
|
#ifdef FEAT_GUI_MAC
|
||||||
# include <Types.h>
|
# include <Types.h>
|
||||||
/*# include <Memory.h>*/
|
/*# include <Memory.h>*/
|
||||||
@ -102,7 +94,7 @@ class VimWidget;
|
|||||||
* GUIs that support dropping files on a running Vim.
|
* GUIs that support dropping files on a running Vim.
|
||||||
*/
|
*/
|
||||||
#if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MAC) \
|
#if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MAC) \
|
||||||
|| defined(FEAT_GUI_BEOS) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE)
|
|| defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE)
|
||||||
# define HAVE_DROP_FILE
|
# define HAVE_DROP_FILE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -230,9 +222,6 @@ typedef struct GuiScrollbar
|
|||||||
scroll_shift is set to the number of shifts
|
scroll_shift is set to the number of shifts
|
||||||
to reduce the count. */
|
to reduce the count. */
|
||||||
#endif
|
#endif
|
||||||
#if FEAT_GUI_BEOS
|
|
||||||
VimScrollBar *id; /* Pointer to real scroll bar */
|
|
||||||
#endif
|
|
||||||
#ifdef FEAT_GUI_MAC
|
#ifdef FEAT_GUI_MAC
|
||||||
ControlHandle id; /* A handle to the scrollbar */
|
ControlHandle id; /* A handle to the scrollbar */
|
||||||
#endif
|
#endif
|
||||||
@ -476,14 +465,6 @@ typedef struct Gui
|
|||||||
guicolor_T currBgColor; /* Current background text color */
|
guicolor_T currBgColor; /* Current background text color */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef FEAT_GUI_BEOS
|
|
||||||
VimApp *vimApp;
|
|
||||||
VimWindow *vimWindow;
|
|
||||||
VimFormView *vimForm;
|
|
||||||
VimTextAreaView *vimTextArea;
|
|
||||||
int vdcmp; /* Vim Direct Communication Message Port */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef FEAT_GUI_MAC
|
#ifdef FEAT_GUI_MAC
|
||||||
WindowPtr VimWindow;
|
WindowPtr VimWindow;
|
||||||
MenuHandle MacOSHelpMenu; /* Help menu provided by the MacOS */
|
MenuHandle MacOSHelpMenu; /* Help menu provided by the MacOS */
|
||||||
@ -493,12 +474,6 @@ typedef struct Gui
|
|||||||
int visibility; /* Is window partially/fully obscured? */
|
int visibility; /* Is window partially/fully obscured? */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(FEAT_GUI_AMIGA)
|
|
||||||
struct Window *window; /* a handle to the amiga window */
|
|
||||||
struct Menu *menu; /* a pointer to the first menu */
|
|
||||||
struct TextFont *textfont; /* a pointer to the font structure */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef RISCOS
|
#ifdef RISCOS
|
||||||
int window_handle;
|
int window_handle;
|
||||||
char_u *window_title;
|
char_u *window_title;
|
||||||
|
@ -192,15 +192,6 @@ beos_select(int nbits,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if FEAT_GUI_BEOS
|
|
||||||
/*
|
|
||||||
* If not reading from terminal, pretend there is input.
|
|
||||||
* This makes the pty reading (for the GUI) "work" for
|
|
||||||
* :!ls but not for :r !ls ... weird.
|
|
||||||
*/
|
|
||||||
if (gui.in_use && State == EXTERNCMD)
|
|
||||||
return 1;
|
|
||||||
#endif
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user