gtkmm r970 - in trunk: . demos/gtk-demo gtk/gtkmm gtk/src

[murrayc svn gnome org]

Author: murrayc
Date: Sat Feb 23 18:41:08 2008
New Revision: 970
URL: http://svn.gnome.org/viewvc/gtkmm?rev=970&view=rev

Log:
2008-02-21  Deng Xiyue <manphiz gmail com>

* demos/gtk-demo/demowindow.cc
* demos/gtk-demo/example_pixbufs.cc
* demos/gtk-demo/example_textview.cc
* demos/gtk-demo/example_treeview_editable_cells.cc
* demos/gtk-demo/textwidget.cc
* gtk/gtkmm/targetentry.cc
* gtk/src/ruler.ccg
* gtk/src/scale.ccg
* gtk/src/treeview.hg
Fix header inclusion and use using directive for C functions to
fix build on gcc-4.3 and Solaris.  Refined from Tim Mooney's
patch.
(Bug #498438, #517530)

Modified:
   trunk/ChangeLog
   trunk/demos/gtk-demo/demowindow.cc
   trunk/demos/gtk-demo/example_pixbufs.cc
   trunk/demos/gtk-demo/example_textview.cc
   trunk/demos/gtk-demo/example_treeview_editable_cells.cc
   trunk/demos/gtk-demo/textwidget.cc
   trunk/gtk/gtkmm/targetentry.cc
   trunk/gtk/src/ruler.ccg
   trunk/gtk/src/scale.ccg
   trunk/gtk/src/treesortable.hg
   trunk/gtk/src/treeview.hg

Modified: trunk/demos/gtk-demo/demowindow.cc
==============================================================================
--- trunk/demos/gtk-demo/demowindow.cc	(original)
+++ trunk/demos/gtk-demo/demowindow.cc	Sat Feb 23 18:41:08 2008
@@ -31,7 +31,12 @@
 #include <cctype>
 #include <cerrno>
 #include <stdio.h>
-#include <string.h>
+
+#include <cstring>
+
+using std::isspace;
+using std::strlen;
+
 #include "demo-common.h"
 
 #ifdef NEED_FLOCKFILE_PROTO

Modified: trunk/demos/gtk-demo/example_pixbufs.cc
==============================================================================
--- trunk/demos/gtk-demo/example_pixbufs.cc	(original)
+++ trunk/demos/gtk-demo/example_pixbufs.cc	Sat Feb 23 18:41:08 2008
@@ -15,7 +15,6 @@
 //#include <config.h>
 
 #include <gtkmm.h>
-#include <stdlib.h>
 #include <math.h>
 #include "demo-common.h"
 

Modified: trunk/demos/gtk-demo/example_textview.cc
==============================================================================
--- trunk/demos/gtk-demo/example_textview.cc	(original)
+++ trunk/demos/gtk-demo/example_textview.cc	Sat Feb 23 18:41:08 2008
@@ -7,11 +7,15 @@
  *
  */
 
-#include "gtkmm.h"
-#include "gtk/gtkstock.h"
-#include "gtk/gtk.h"
+#include <cstdlib>
+#include <gtkmm.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
+
 #include "demo-common.h"
 
+using std::exit;
+
 class Window_EasterEgg : public Gtk::Window
 {
 public:

Modified: trunk/demos/gtk-demo/example_treeview_editable_cells.cc
==============================================================================
--- trunk/demos/gtk-demo/example_treeview_editable_cells.cc	(original)
+++ trunk/demos/gtk-demo/example_treeview_editable_cells.cc	Sat Feb 23 18:41:08 2008
@@ -6,8 +6,11 @@
  *
  */
 
+#include <cstdlib>
 #include <gtkmm.h>
 
+using std::strtod;
+
 class CellItem_Product
 {
 public:

Modified: trunk/demos/gtk-demo/textwidget.cc
==============================================================================
--- trunk/demos/gtk-demo/textwidget.cc	(original)
+++ trunk/demos/gtk-demo/textwidget.cc	Sat Feb 23 18:41:08 2008
@@ -19,9 +19,13 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <cstring>
 #include "textwidget.h"
-#include <string.h>
 #include "pangomm/fontdescription.h"
+  
+using std::strstr;
+using std::strncmp;
+using std::strlen;
 
 
 TextWidget::TextWidget(bool is_source)

Modified: trunk/gtk/gtkmm/targetentry.cc
==============================================================================
--- trunk/gtk/gtkmm/targetentry.cc	(original)
+++ trunk/gtk/gtkmm/targetentry.cc	Sat Feb 23 18:41:08 2008
@@ -23,6 +23,8 @@
 #include <gtkmm/targetentry.h>
 #include <cstring> //For memset().
 
+using std::memset;
+
 namespace Gtk
 {
 

Modified: trunk/gtk/src/ruler.ccg
==============================================================================
--- trunk/gtk/src/ruler.ccg	(original)
+++ trunk/gtk/src/ruler.ccg	Sat Feb 23 18:41:08 2008
@@ -25,6 +25,7 @@
 #include <gtk/gtkvruler.h>
 #include <cstring>
 
+using std::strcmp;
 
 namespace Gtk
 {

Modified: trunk/gtk/src/scale.ccg
==============================================================================
--- trunk/gtk/src/scale.ccg	(original)
+++ trunk/gtk/src/scale.ccg	Sat Feb 23 18:41:08 2008
@@ -29,6 +29,8 @@
 #include <cstring> //For strlen()
 #include <memory>
 
+using std::strlen;
+
 namespace Gtk
 {
 

Modified: trunk/gtk/src/treesortable.hg
==============================================================================
--- trunk/gtk/src/treesortable.hg	(original)
+++ trunk/gtk/src/treesortable.hg	Sat Feb 23 18:41:08 2008
@@ -35,6 +35,8 @@
 namespace Gtk
 {
 
+//TODO: This should maybe derive from TreeModel, because it is a prerequisite. murrayc
+
 /**
  * @ingroup TreeView
 */

Modified: trunk/gtk/src/treeview.hg
==============================================================================
--- trunk/gtk/src/treeview.hg	(original)
+++ trunk/gtk/src/treeview.hg	Sat Feb 23 18:41:08 2008
@@ -36,6 +36,9 @@
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/container_p.h)
 
+#include <cstdlib>
+
+using std::strtod;
 
 namespace Gtk
 {