Mercurial > gftp.yaz
diff src/gtk/gftp-gtk.h @ 45:311e29c40ed6
2002-10-31 Brian Masney <masneyb@gftp.org>
* src/gtk/*.[ch] - don't check for gtk+ version based on the minor
version. May cause problems later on.
* lib/protocols.c src/gtk/bookmarks.c src/gtk/misc-gtk.c - use UTF8
functions for user data when using glib 2.0
| author | masneyb |
|---|---|
| date | Thu, 31 Oct 2002 23:55:17 +0000 |
| parents | cd169e4789df |
| children | a12bcbc2fce4 |
line wrap: on
line diff
--- a/src/gtk/gftp-gtk.h Wed Oct 30 22:56:30 2002 +0000 +++ b/src/gtk/gftp-gtk.h Thu Oct 31 23:55:17 2002 +0000 @@ -30,7 +30,7 @@ #define IS_ONE_SELECTED(wdata) (GTK_CLIST ((wdata)->listbox)->selection && GTK_CLIST ((wdata)->listbox)->selection->next == NULL) #define IS_NONE_SELECTED(wdata) (GTK_CLIST ((wdata)->listbox)->selection == NULL) -#if GTK_MAJOR_VERSION == 1 && GTK_MINOR_VERSION == 2 +#if GTK_MAJOR_VERSION == 1 #define gtk_widget_set_size_request(widget, width, height) \ gtk_widget_set_usize (widget, width, height) #endif @@ -139,7 +139,7 @@ extern GtkWidget * stop_btn, * hostedit, * useredit, * passedit, * portedit, * logwdw, * dlwdw, * protocol_menu, * optionmenu; extern GtkAdjustment * logwdw_vadj; -#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 0 +#if GTK_MAJOR_VERSION > 1 extern GtkTextMark * logwdw_textmark; #endif extern int local_start, remote_start, trans_start, log_start, tools_start;