Mercurial > pidgin
comparison gtk/gtkgaim.h @ 20387:24843d86c2a3
sf patch #1644019, from good ol' Ka-Hing Cheung
"fix compiling on gtk 2.4. xmppconsole.c is the culprit.
gtk_combo_box_get_active_text is defined in gtk 2.6 but not 2.4."
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 25 Jan 2007 08:29:50 +0000 |
parents | d67f4b21ec18 |
children |
comparison
equal
deleted
inserted
replaced
20386:1657b86dc04e | 20387:24843d86c2a3 |
---|---|
53 * as the old (slightly buggy) wrap behavior. | 53 * as the old (slightly buggy) wrap behavior. |
54 * It also includes our back-ported GtkExpander | 54 * It also includes our back-ported GtkExpander |
55 */ | 55 */ |
56 /** @cond */ | 56 /** @cond */ |
57 #if (!GTK_CHECK_VERSION(2,4,0)) | 57 #if (!GTK_CHECK_VERSION(2,4,0)) |
58 #define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD | 58 # define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD |
59 #include "gtkexpander.h" | 59 # include "gtkexpander.h" |
60 #endif | 60 #endif |
61 /** @endcond */ | 61 /** @endcond */ |
62 | 62 |
63 /* | 63 /* |
64 * We include the sources for GtkComboBox and GtkCellView because | 64 * We include the sources for GtkComboBox and GtkCellView because |
65 * they don't exist in older version of Gtk+, and we use them | 65 * they don't exist in older versions of GTK+, and we use them |
66 * in a few places. | 66 * in a few places. |
67 */ | 67 */ |
68 #if !GTK_CHECK_VERSION(2,6,0) | 68 #if !GTK_CHECK_VERSION(2,6,0) |
69 # include "gtkcellview.h" | 69 # include "gtkcellview.h" |
70 # include "gtkcellviewmenuitem.h" | 70 # include "gtkcellviewmenuitem.h" |
71 # include "gaimcombobox.h" | |
71 # if !GTK_CHECK_VERSION(2,4,0) | 72 # if !GTK_CHECK_VERSION(2,4,0) |
72 # include "gtkcelllayout.h" | 73 # include "gtkcelllayout.h" |
73 # include "gaimcombobox.h" | 74 # endif /* Less than GTK+ 2.4 */ |
74 # endif /* Gtk 2.4 */ | 75 #endif /* Less than GTK+ 2.6 */ |
75 #endif /* Gtk 2.6 */ | |
76 | 76 |
77 /* | 77 /* |
78 * Spacings between components, as defined by the | 78 * Spacings between components, as defined by the |
79 * GNOME Human Interface Guidelines. | 79 * GNOME Human Interface Guidelines. |
80 */ | 80 */ |