projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d02ad552 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.180 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 6.2.180 | |
| 11 | Problem: Compiling with GTK2 on Win32 doesn't work. | |
| 12 | Solution: Include gdkwin32.h instead of gdkx.h. (Srinath Avadhanula) | |
| 13 | Files: src/gui_gtk.c, src/gui_gtk_f.c, src/gui_gtk_x11.c, src/mbyte.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.2.179/src/gui_gtk.c Mon Jun 2 22:22:50 2003 | |
| 17 | --- src/gui_gtk.c Tue Dec 23 11:41:29 2003 | |
| 18 | *************** | |
| 19 | *** 109,115 **** | |
| 20 | #ifdef FEAT_GUI_GTK | |
| 21 | # include <gdk/gdkkeysyms.h> | |
| 22 | # include <gdk/gdk.h> | |
| 23 | ! # include <gdk/gdkx.h> | |
| 24 | ||
| 25 | # include <gtk/gtk.h> | |
| 26 | #else | |
| 27 | --- 109,119 ---- | |
| 28 | #ifdef FEAT_GUI_GTK | |
| 29 | # include <gdk/gdkkeysyms.h> | |
| 30 | # include <gdk/gdk.h> | |
| 31 | ! # ifdef WIN3264 | |
| 32 | ! # include <gdk/gdkwin32.h> | |
| 33 | ! # else | |
| 34 | ! # include <gdk/gdkx.h> | |
| 35 | ! # endif | |
| 36 | ||
| 37 | # include <gtk/gtk.h> | |
| 38 | #else | |
| 39 | *** ../vim-6.2.179/src/gui_gtk_f.c Fri Apr 25 19:49:56 2003 | |
| 40 | --- src/gui_gtk_f.c Tue Dec 23 11:41:48 2003 | |
| 41 | *************** | |
| 42 | *** 32,38 **** | |
| 43 | runtime! */ | |
| 44 | #include "gui_gtk_f.h" | |
| 45 | #include <gtk/gtksignal.h> | |
| 46 | ! #include <gdk/gdkx.h> | |
| 47 | ||
| 48 | typedef struct _GtkFormChild GtkFormChild; | |
| 49 | ||
| 50 | --- 32,42 ---- | |
| 51 | runtime! */ | |
| 52 | #include "gui_gtk_f.h" | |
| 53 | #include <gtk/gtksignal.h> | |
| 54 | ! #ifdef WIN3264 | |
| 55 | ! # include <gdk/gdkwin32.h> | |
| 56 | ! #else | |
| 57 | ! # include <gdk/gdkx.h> | |
| 58 | ! #endif | |
| 59 | ||
| 60 | typedef struct _GtkFormChild GtkFormChild; | |
| 61 | ||
| 62 | *** ../vim-6.2.179/src/gui_gtk_x11.c Sat Sep 27 19:36:47 2003 | |
| 63 | --- src/gui_gtk_x11.c Tue Dec 23 11:41:57 2003 | |
| 64 | *************** | |
| 65 | *** 68,74 **** | |
| 66 | #else | |
| 67 | # include <gdk/gdkkeysyms.h> | |
| 68 | # include <gdk/gdk.h> | |
| 69 | ! # include <gdk/gdkx.h> | |
| 70 | ||
| 71 | # include <gtk/gtk.h> | |
| 72 | # include "gui_gtk_f.h" | |
| 73 | --- 68,78 ---- | |
| 74 | #else | |
| 75 | # include <gdk/gdkkeysyms.h> | |
| 76 | # include <gdk/gdk.h> | |
| 77 | ! # ifdef WIN3264 | |
| 78 | ! # include <gdk/gdkwin32.h> | |
| 79 | ! # else | |
| 80 | ! # include <gdk/gdkx.h> | |
| 81 | ! # endif | |
| 82 | ||
| 83 | # include <gtk/gtk.h> | |
| 84 | # include "gui_gtk_f.h" | |
| 85 | *** ../vim-6.2.179/src/mbyte.c Mon Dec 29 21:17:44 2003 | |
| 86 | --- src/mbyte.c Tue Dec 23 16:03:30 2003 | |
| 87 | *************** | |
| 88 | *** 102,108 **** | |
| 89 | ||
| 90 | #if defined(FEAT_XIM) && defined(HAVE_GTK2) | |
| 91 | # include <gdk/gdkkeysyms.h> | |
| 92 | ! # include <gdk/gdkx.h> | |
| 93 | #endif | |
| 94 | ||
| 95 | #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 96 | --- 102,112 ---- | |
| 97 | ||
| 98 | #if defined(FEAT_XIM) && defined(HAVE_GTK2) | |
| 99 | # include <gdk/gdkkeysyms.h> | |
| 100 | ! # ifdef WIN3264 | |
| 101 | ! # include <gdk/gdkwin32.h> | |
| 102 | ! # else | |
| 103 | ! # include <gdk/gdkx.h> | |
| 104 | ! # endif | |
| 105 | #endif | |
| 106 | ||
| 107 | #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 108 | *************** | |
| 109 | *** 3620,3626 **** | |
| 110 | #endif | |
| 111 | ||
| 112 | #ifdef FEAT_GUI_GTK | |
| 113 | ! # include <gdk/gdkx.h> | |
| 114 | #else | |
| 115 | # ifdef PROTO | |
| 116 | /* Define a few things to be able to generate prototypes while not configured | |
| 117 | --- 3624,3634 ---- | |
| 118 | #endif | |
| 119 | ||
| 120 | #ifdef FEAT_GUI_GTK | |
| 121 | ! # ifdef WIN3264 | |
| 122 | ! # include <gdk/gdkwin32.h> | |
| 123 | ! # else | |
| 124 | ! # include <gdk/gdkx.h> | |
| 125 | ! # endif | |
| 126 | #else | |
| 127 | # ifdef PROTO | |
| 128 | /* Define a few things to be able to generate prototypes while not configured | |
| 129 | *** ../vim-6.2.179/src/version.c Sun Jan 11 12:32:47 2004 | |
| 130 | --- src/version.c Sun Jan 11 12:43:44 2004 | |
| 131 | *************** | |
| 132 | *** 639,640 **** | |
| 133 | --- 639,642 ---- | |
| 134 | { /* Add new patch number below this line */ | |
| 135 | + /**/ | |
| 136 | + 180, | |
| 137 | /**/ | |
| 138 | ||
| 139 | -- | |
| 140 | hundred-and-one symptoms of being an internet addict: | |
| 141 | 227. You sleep next to your monitor. Or on top of it. | |
| 142 | ||
| 143 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 144 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 145 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 146 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |