Do without GtkSelectionWindow

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

diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index 69fea65bbaa7c90ed496886d863f65fe8c783d5e..28bc76ca2840ec59c19362716f157f10fbb2af7b 100644 (file)
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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/>.
  */
 
 /*
@@ -93,7 +91,7 @@ static void gtk_image_menu_item_toggle_size_request  (GtkMenuItem      *menu_ite
                                                       gint             *requisition);
 static void gtk_image_menu_item_set_label            (GtkMenuItem      *menu_item,
                                                       const gchar      *label);
-static G_CONST_RETURN gchar *gtk_image_menu_item_get_label (GtkMenuItem *menu_item);
+static const gchar * gtk_image_menu_item_get_label   (GtkMenuItem *menu_item);
 
 static void gtk_image_menu_item_forall               (GtkContainer    *container,
                                                       gboolean         include_internals,
@@ -424,7 +422,7 @@ gtk_image_menu_item_set_label (GtkMenuItem      *menu_item,
     }
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gtk_image_menu_item_get_label (GtkMenuItem *menu_item)
 {
   GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
@@ -774,10 +772,11 @@ gtk_image_menu_item_sync_action_properties (GtkActivatable *activatable,
 
 /**
  * gtk_image_menu_item_new:
- * @returns: a new #GtkImageMenuItem.
  *
  * Creates a new #GtkImageMenuItem with an empty label.
- **/
+ *
+ * Returns: a new #GtkImageMenuItem
+ */
 GtkWidget*
 gtk_image_menu_item_new (void)
 {
@@ -787,9 +786,10 @@ gtk_image_menu_item_new (void)
 /**
  * gtk_image_menu_item_new_with_label:
  * @label: the text of the menu item.
- * @returns: a new #GtkImageMenuItem.
  *
  * Creates a new #GtkImageMenuItem containing a label.
+ *
+ * Returns: a new #GtkImageMenuItem.
  */
 GtkWidget*
 gtk_image_menu_item_new_with_label (const gchar *label)
@@ -799,16 +799,16 @@ gtk_image_menu_item_new_with_label (const gchar *label)
                        NULL);
 }
 
-
 /**
  * gtk_image_menu_item_new_with_mnemonic:
  * @label: the text of the menu item, with an underscore in front of the
  *         mnemonic character
- * @returns: a new #GtkImageMenuItem
  *
  * Creates a new #GtkImageMenuItem containing a label. The label
  * will be created using gtk_label_new_with_mnemonic(), so underscores
  * in @label indicate the mnemonic for the menu item.
+ *
+ * Returns: a new #GtkImageMenuItem
  */
 GtkWidget*
 gtk_image_menu_item_new_with_mnemonic (const gchar *label)
@@ -824,7 +824,6 @@ gtk_image_menu_item_new_with_mnemonic (const gchar *label)
  * @stock_id: the name of the stock item.
  * @accel_group: (allow-none): the #GtkAccelGroup to add the menu items
  *   accelerator to, or %NULL.
- * @returns: a new #GtkImageMenuItem.
  *
  * Creates a new #GtkImageMenuItem containing the image and text from a
  * stock item. Some stock ids have preprocessor macros like #GTK_STOCK_OK
@@ -835,6 +834,8 @@ gtk_image_menu_item_new_with_mnemonic (const gchar *label)
  * appropriate path for the menu item, use gtk_stock_lookup() to look up the
  * standard accelerator for the stock item, and if one is found, call
  * gtk_accel_map_add_entry() to register it.
+ *
+ * Returns: a new #GtkImageMenuItem.
  */
 GtkWidget*
 gtk_image_menu_item_new_from_stock (const gchar   *stock_id,