[Gaim-commits] SF.net SVN: gaim: [17020] trunk

[<sa...@us...>]

Revision: 17020
Author:   sadrul
Date:     2006-08-24 12:41:34 -0700 (Thu, 24 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17020&view=rev

Log Message:
-----------
Some distros put the ncursesw headers in ncursesw/, some don't.

Modified Paths:
--------------
    trunk/configure.ac
    trunk/console/libgnt/gntcolors.c
    trunk/console/libgnt/gntmain.c
    trunk/console/libgnt/gntwidget.h
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-08-24 18:33:53 UTC (rev 17019)
+++ trunk/configure.ac	2006-08-24 19:41:34 UTC (rev 17020)
@@ -807,6 +807,9 @@
 if test "x$enable_gnt" = "xyes"; then
 	AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_gnt=no])
 	AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_gnt=no])
+
+	# Some distros put the headers in ncursesw/, some don't
+	AC_CHECK_HEADER(ncursesw/ncurses.h, [AC_DEFINE(HAVE_NCURSESW_INC, 1, [Define if you have the ncursesw headers in ncursesw/])])
 else
 	enable_gnt=no
 fi

Modified: trunk/console/libgnt/gntcolors.c
===================================================================
--- trunk/console/libgnt/gntcolors.c	2006-08-24 18:33:53 UTC (rev 17019)
+++ trunk/console/libgnt/gntcolors.c	2006-08-24 19:41:34 UTC (rev 17020)
@@ -1,4 +1,9 @@
+#ifdef HAVE_NCURSESW_INC
 #include <ncursesw/ncurses.h>
+#else
+#include <ncurses.h>
+#endif
+
 #include "gntcolors.h"
 #include "gntstyle.h"
 

Modified: trunk/console/libgnt/gntmain.c
===================================================================
--- trunk/console/libgnt/gntmain.c	2006-08-24 18:33:53 UTC (rev 17019)
+++ trunk/console/libgnt/gntmain.c	2006-08-24 19:41:34 UTC (rev 17020)
@@ -1,4 +1,8 @@
+#ifdef HAVE_NCURSESW_INC
 #include <ncursesw/panel.h>
+#else
+#include <panel.h>
+#endif
 
 #include "gnt.h"
 #include "gntbox.h"
@@ -485,9 +489,9 @@
  * Mouse support:
  *  - bring a window on top if you click on its taskbar
  *  - click on the top-bar of the active window and drag+drop to move a window
+ *  - click on a window to bring it to focus
  *  wishlist:
  *   - have a little [X] on the windows, and clicking it will close that window.
- *   - click on a window to bring it to focus
  *   - allow scrolling in tree/textview on wheel-scroll event
  *   - click to activate button or select a row in tree
  *      - all these can be fulfilled by adding a "clicked" event for GntWidget

Modified: trunk/console/libgnt/gntwidget.h
===================================================================
--- trunk/console/libgnt/gntwidget.h	2006-08-24 18:33:53 UTC (rev 17019)
+++ trunk/console/libgnt/gntwidget.h	2006-08-24 19:41:34 UTC (rev 17020)
@@ -4,7 +4,11 @@
 #include <stdio.h>
 #include <glib.h>
 #include <glib-object.h>
-#include <ncursesw/curses.h>
+#ifdef HAVE_NCURSESW_INC
+#include <ncursesw/ncurses.h>
+#else
+#include <ncurses.h>
+#endif
 
 #define GNT_TYPE_WIDGET				(gnt_widget_get_gtype())
 #define GNT_WIDGET(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_WIDGET, GntWidget))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.