filechooserbutton: New test for opening the Other item in the combo box and then...

[~andy/gtk] / gtk / gtktreemenu.c

diff --git a/gtk/gtktreemenu.c b/gtk/gtktreemenu.c
index a2f1290ca7c33cf5dd6ad651764ceff9b54dd7ab..8fef02e6f97af0807ea9c798e7afbf845d2ab28b 100644 (file)
--- a/gtk/gtktreemenu.c
+++ b/gtk/gtktreemenu.c
@@ -18,9 +18,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -38,7 +36,6 @@
 #include "gtktreemenu.h"
 #include "gtkmarshalers.h"
 #include "gtkmenuitem.h"
-#include "gtktearoffmenuitem.h"
 #include "gtkseparatormenuitem.h"
 #include "gtkcellareabox.h"
 #include "gtkcellareacontext.h"
@@ -47,6 +44,12 @@
 #include "gtkmenushellprivate.h"
 #include "gtkprivate.h"
 
+#undef GDK_DEPRECATED
+#undef GDK_DEPRECATED_FOR
+#define GDK_DEPRECATED
+#define GDK_DEPRECATED_FOR(f)
+
+#include "deprecated/gtktearoffmenuitem.h"
 
 /* GObjectClass */
 static GObject  *gtk_tree_menu_constructor                    (GType                  type,
@@ -300,7 +303,7 @@ _gtk_tree_menu_class_init (GtkTreeMenuClass *class)
    *
    * If you dont provide a root for the #GtkTreeMenu then the whole
    * model will be added to the menu. Specifying a root allows you
-   * to build a menu for a given #GtkTreePath and it's children.
+   * to build a menu for a given #GtkTreePath and its children.
    * 
    * Since: 3.0
    */
@@ -690,7 +693,7 @@ gtk_tree_menu_get_path_item (GtkTreeMenu          *menu,
               path = gtk_tree_row_reference_get_path (row);
 
               if (!path)
-                /* Return any first child where it's row-reference became invalid,
+                /* Return any first child where its row-reference became invalid,
                  * this is because row-references get null paths before we recieve
                  * the "row-deleted" signal.
                  */
@@ -706,7 +709,7 @@ gtk_tree_menu_get_path_item (GtkTreeMenu          *menu,
             path = gtk_cell_view_get_displayed_row (GTK_CELL_VIEW (view));
 
           if (!path)
-            /* Return any first child where it's row-reference became invalid,
+            /* Return any first child where its row-reference became invalid,
              * this is because row-references get null paths before we recieve
              * the "row-deleted" signal.
              */
@@ -882,7 +885,7 @@ row_inserted_cb (GtkTreeModel     *model,
           depth   = gtk_tree_path_get_depth (path);
           index   = indices[depth -1];
 
-          /* Menus with a header include a menuitem for it's root node
+          /* Menus with a header include a menuitem for its root node
            * and a separator menu item */
           if (priv->menu_with_header)
             index += 2;
@@ -961,7 +964,7 @@ row_reordered_cb (GtkTreeModel    *model,
   GtkTreeMenuPrivate *priv = menu->priv;
   gboolean            this_menu = FALSE;
 
-  if (path == NULL || priv->root == NULL)
+  if (gtk_tree_path_get_depth (path) == 0 && !priv->root)
     this_menu = TRUE;
   else if (priv->root)
     {
@@ -1552,7 +1555,7 @@ _gtk_tree_menu_new (void)
  * _gtk_tree_menu_new_with_area:
  * @area: the #GtkCellArea to use to render cells in the menu
  *
- * Creates a new #GtkTreeMenu using @area to render it's cells.
+ * Creates a new #GtkTreeMenu using @area to render its cells.
  *
  * Return value: A newly created #GtkTreeMenu with no model or root.
  *
@@ -1572,7 +1575,7 @@ _gtk_tree_menu_new_with_area (GtkCellArea    *area)
  * @model: (allow-none): the #GtkTreeModel to build the menu heirarchy from, or %NULL.
  * @root: (allow-none): the #GtkTreePath indicating the root row for this menu, or %NULL.
  *
- * Creates a new #GtkTreeMenu hierarchy from the provided @model and @root using @area to render it's cells.
+ * Creates a new #GtkTreeMenu hierarchy from the provided @model and @root using @area to render its cells.
  *
  * Return value: A newly created #GtkTreeMenu.
  *