gtkmm-documentation r60 - in trunk: . docs docs/tutorial examples/book/drag_and_drop examples/others/dnd

[murrayc svn gnome org]

Author: murrayc
Date: Tue Aug  5 13:04:53 2008
New Revision: 60
URL: http://svn.gnome.org/viewvc/gtkmm-documentation?rev=60&view=rev

Log:
2008-08-05  Murray Cumming  <murrayc murrayc com>

* examples/book/drag_and_drop/dndwindow.cc:
* examples/others/dnd/dnd_images.h:
* examples/others/dnd/dndwindow.cc: Updated for latest non-deprecated 
SelectionData API.

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in
   trunk/docs/Makefile.am
   trunk/docs/tutorial/Makefile.am
   trunk/examples/book/drag_and_drop/dndwindow.cc
   trunk/examples/others/dnd/dnd_images.h
   trunk/examples/others/dnd/dndwindow.cc

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Aug  5 13:04:53 2008
@@ -1,3 +1,19 @@
+2.13.2:
+
+* Timeouts: Updated the inline example code and text.
+  (Ainsley Pereira) Bug #537858
+* Add a COPYING.examples and corrected COPYING to GFDL-1.2, as 
+  used in the documentation text.
+  (Deng Xiyue) Bug #545892
+* Install generated html, as we did when this was in the gtkmm tarball.
+  (Deng Xiyue)
+* Remove index.html because the definitive copy of this is on the website.
+  (Murray Cumming)
+* Fix the examples build for gcc 4.3, adding headers.
+  (Deng Xiyue)
+* Update the links for Visual C++ 2005.
+  (Deng Xiyue)
+
 2.13.1:
 
 * Uses gnome-doc-utils, so it can be translated and installed properly.

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Aug  5 13:04:53 2008
@@ -15,7 +15,7 @@
 #We use pushdef here because we can't use shell variables before AC_INIT, but we want to use a variable with AC_INIT:
 pushdef([GTKMM_DOCUMENTATION_MAJOR_VERSION],     [2])
 pushdef([GTKMM_DOCUMENTATION_MINOR_VERSION],     [13])
-pushdef([GTKMM_DOCUMENTATION_MICRO_VERSION],     [1])
+pushdef([GTKMM_DOCUMENTATION_MICRO_VERSION],     [2])
 pushdef([GTKMM_DOCUMENTATION_EXTRA_VERSION],     [])
 pushdef([GTKMM_DOCUMENTATION_VERSION], GTKMM_DOCUMENTATION_MAJOR_VERSION.GTKMM_DOCUMENTATION_MINOR_VERSION.GTKMM_DOCUMENTATION_MICRO_VERSION[]GTKMM_DOCUMENTATION_EXTRA_VERSION)
 AC_INIT([gtkmm-documentation], GTKMM_DOCUMENTATION_VERSION, [gtkmm-list gnome org])

Modified: trunk/docs/Makefile.am
==============================================================================
--- trunk/docs/Makefile.am	(original)
+++ trunk/docs/Makefile.am	Tue Aug  5 13:04:53 2008
@@ -3,7 +3,7 @@
 
 SUBDIRS = FAQ images tutorial
 
-EXTRA_DIST = Makefile_web.am_fragment index.html
+EXTRA_DIST = Makefile_web.am_fragment
 
 # gtkmm_doc_DATA = 
 

Modified: trunk/docs/tutorial/Makefile.am
==============================================================================
--- trunk/docs/tutorial/Makefile.am	(original)
+++ trunk/docs/tutorial/Makefile.am	Tue Aug  5 13:04:53 2008
@@ -137,8 +137,8 @@
 	  echo " rm -f $(DESTDIR)$(tutorialdir)/$$f"; \
 	  rm -f $(DESTDIR)$(tutorialdir)/$$f; \
 	done
-	rm -f $(DESTDIR)$(tutorialdir)/style.css
-	rm -f $(DESTDIR)$(tutorialdir)/icons
+	rm -f $(DESTDIR)$(tutorialdir)/html/style.css
+	rm -f $(DESTDIR)$(tutorialdir)/html/icons
 
 all-local: html/index.html
 

Modified: trunk/examples/book/drag_and_drop/dndwindow.cc
==============================================================================
--- trunk/examples/book/drag_and_drop/dndwindow.cc	(original)
+++ trunk/examples/book/drag_and_drop/dndwindow.cc	Tue Aug  5 13:04:53 2008
@@ -74,7 +74,9 @@
         const Glib::RefPtr<Gdk::DragContext>& context, int, int,
         const Gtk::SelectionData& selection_data, guint, guint time)
 {
-  if((selection_data.get_length() >= 0) && (selection_data.get_format() == 8))
+  guint length = 0;
+  selection_data.get_data(length);
+  if((length >= 0) && (selection_data.get_format() == 8))
   {
     std::cout << "Received \"" << selection_data.get_data_as_string()
         << "\" in label " << std::endl;

Modified: trunk/examples/others/dnd/dnd_images.h
==============================================================================
--- trunk/examples/others/dnd/dnd_images.h	(original)
+++ trunk/examples/others/dnd/dnd_images.h	Tue Aug  5 13:04:53 2008
@@ -1,5 +1,5 @@
 /* XPM */
-static char * drag_icon_xpm[] = {
+static const char * drag_icon_xpm[] = {
 "36 48 9 1",
 " 	c None",
 ".	c #020204",
@@ -60,7 +60,7 @@
 "...................................."};
 
 /* XPM */
-static char * trashcan_closed_xpm[] = {
+static const char * trashcan_closed_xpm[] = {
 "64 80 17 1",
 " 	c None",
 ".	c #030304",
@@ -161,7 +161,7 @@
 "                                                                "};
 
 /* XPM */
-static char * trashcan_open_xpm[] = {
+static const char * trashcan_open_xpm[] = {
 "64 80 17 1",
 " 	c None",
 ".	c #030304",

Modified: trunk/examples/others/dnd/dndwindow.cc
==============================================================================
--- trunk/examples/others/dnd/dndwindow.cc	(original)
+++ trunk/examples/others/dnd/dndwindow.cc	Tue Aug  5 13:04:53 2008
@@ -100,9 +100,12 @@
 
 void DnDWindow::on_label_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int, int, const Gtk::SelectionData& selection_data, guint, guint time)
 {
-  if ((selection_data.get_length() >= 0) && (selection_data.get_format() == 8))
+  guint length = 0;
+  const guchar* data = selection_data.get_data(length);
+
+  if((length >= 0) && (selection_data.get_format() == 8))
   {
-    g_print ("Received \"%s\" in label\n", (gchar *)selection_data.get_data());
+    g_print ("Received \"%s\" in label\n", (gchar *)data);
   }
 
   context->drag_finish(false, false, time);
@@ -110,7 +113,7 @@
 
 bool DnDWindow::on_label_popup_drag_motion(const Glib::RefPtr<Gdk::DragContext>&, int, int, guint)
 {
-  if (!m_popup_timer)
+  if(!m_popup_timer)
     m_popup_timer = Glib::signal_timeout().connect( sigc::mem_fun(*this, &DnDWindow::on_popup_timeout), 500);
 
   return true;
@@ -118,7 +121,7 @@
 
 void DnDWindow::on_label_popup_drag_leave(const Glib::RefPtr<Gdk::DragContext>&, guint)
 {
- if (m_in_popup)
+ if(m_in_popup)
  {
    m_in_popup = false;
    if(!m_popdown_timer)
@@ -131,9 +134,12 @@
 
 void DnDWindow::on_image_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int, int, const Gtk::SelectionData& selection_data, guint, guint time)
 {
-  if( (selection_data.get_length() >= 0) && (selection_data.get_format() == 8) )
+  guint length = 0;
+  const guchar* data = selection_data.get_data(length);
+
+  if( (length >= 0) && (selection_data.get_format() == 8) )
   {
-    g_print ("Received \"%s\" in trashcan\n", (gchar*)selection_data.get_data());
+    g_print ("Received \"%s\" in trashcan\n", (gchar*)data);
   }
 
   context->drag_finish(false, false, time);
@@ -179,7 +185,7 @@
   m_Image.set(m_trashcan_closed, m_trashcan_closed_mask);
 
      
-  if (context->gobj()->targets)
+  if(context->gobj()->targets)
   {
     std::vector<Glib::ustring> targets = context->get_targets();
     if(targets.size())
@@ -196,7 +202,7 @@
 
 void DnDWindow::on_button_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint info, guint)
 {
-  if (info == TARGET_ROOTWIN)
+  if(info == TARGET_ROOTWIN)
     g_print ("I was dropped on the rootwin\n");
   else
     selection_data.set(selection_data.get_target(),
@@ -220,7 +226,7 @@
 
 bool DnDWindow::on_popup_timeout()
 {
-  if (!m_popped_up)
+  if(!m_popped_up)
   {
     m_PopupWindow.show();
     m_popped_up = true;
@@ -241,9 +247,9 @@
   //Create Table and fill it:
   Gtk::Table* pTable = Gtk::manage(new Gtk::Table(3, 3, false));
 
-  for (int i = 0; i < 3; i++)
+  for(int i = 0; i < 3; i++)
   {
-    for (int j = 0; j < 3; j++)
+    for(int j = 0; j < 3; j++)
     {
       char buffer[128];
       g_snprintf(buffer, sizeof(buffer), "%d,%d", i, j);
@@ -263,7 +269,7 @@
 
 bool DnDWindow::on_popup_button_drag_motion(const Glib::RefPtr<Gdk::DragContext>&, int, int, guint)
 {
-  if (!m_in_popup)
+  if(!m_in_popup)
   {
     m_in_popup = true;
     if(m_popdown_timer)