updated for version 7.0030

diff --git a/src/gui.c b/src/gui.c
index 726158ad84980f37c7718b5aad1fead6cef8cad5..d77a146df38da78dd0f9e1d4508e3486d8ac8268 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -1218,10 +1218,6 @@ gui_resize_shell(pixel_width, pixel_height)
 again:
     busy = TRUE;
 
-#ifdef FEAT_GUI_BEOS
-    vim_lock_screen();
-#endif
-
     /* Flush pending output before redrawing */
     out_flush();
 
@@ -1248,10 +1244,6 @@ again:
            || gui.num_rows != Rows || gui.num_cols != Columns)
        shell_resized();
 
-#ifdef FEAT_GUI_BEOS
-    vim_unlock_screen();
-#endif
-
     gui_update_scrollbars(TRUE);
     gui_update_cursor(FALSE, TRUE);
 #if defined(FEAT_XIM) && !defined(HAVE_GTK2)

diff --git a/src/gui.h b/src/gui.h
index bcb36de7c553400f31842575492184effbb99bca..aad355bfa5b2a7daa3c432f618415b832fde32c7 100644 (file)
--- a/src/gui.h
+++ b/src/gui.h
@@ -11,10 +11,6 @@
 /* #define D(x)        printf x; */
 #define D(x)
 
-#if defined(FEAT_GUI_AMIGA)
-# include <intuition/intuition.h>
-#endif
-
 #ifdef FEAT_GUI_MOTIF
 # define FEAT_GUI_X11
 # include <Xm/Xm.h>
@@ -52,10 +48,6 @@ class VimWidget;
 # include <gtk/gtk.h>
 #endif
 
-#ifdef FEAT_GUI_BEOS
-# include "gui_beos.h"
-#endif
-
 #ifdef FEAT_GUI_MAC
 # include <Types.h>
 /*# include <Memory.h>*/
@@ -102,7 +94,7 @@ class VimWidget;
  * GUIs that support dropping files on a running Vim.
  */
 #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
 #endif
 
@@ -230,9 +222,6 @@ typedef struct GuiScrollbar
                                   scroll_shift is set to the number of shifts
                                   to reduce the count.  */
 #endif
-#if FEAT_GUI_BEOS
-    VimScrollBar *id;          /* Pointer to real scroll bar */
-#endif
 #ifdef FEAT_GUI_MAC
     ControlHandle id;          /* A handle to the scrollbar */
 #endif
@@ -476,14 +465,6 @@ typedef struct Gui
     guicolor_T currBgColor;        /* Current background text color */
 #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
     WindowPtr  VimWindow;
     MenuHandle MacOSHelpMenu;      /* Help menu provided by the MacOS */
@@ -493,12 +474,6 @@ typedef struct Gui
     int                visibility;         /* Is window partially/fully obscured? */
 #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
     int                window_handle;
     char_u     *window_title;

diff --git a/src/os_beos.c b/src/os_beos.c
index e492cab45ae59e8e4055b32e519051c7f1fff0b6..10135aa3b28ab1c718070e7d1ccdae3f4637c211 100644 (file)
--- a/src/os_beos.c
+++ b/src/os_beos.c
@@ -192,15 +192,6 @@ beos_select(int nbits,
     }
 #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;
 }