texthandle: Set a bigger input shape, covering the line height

[~andy/gtk] / gtk / gtkmenuitem.h

diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index efa1bf0bbddf8df190ffdc52668ab0449560389e..9d546d6c3dd59125a4405c5abd71c9fd9b19da09 100644 (file)
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -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/>.
  */
 
 /*
@@ -24,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_MENU_ITEM_H__
+#define __GTK_MENU_ITEM_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_MENU_ITEM_H__
-#define __GTK_MENU_ITEM_H__
-
 #include <gtk/gtkbin.h>
 
 
@@ -76,7 +74,7 @@ struct _GtkMenuItemClass
                                  gint         allocation);
   void (* set_label)            (GtkMenuItem *menu_item,
                                  const gchar *label);
-  G_CONST_RETURN gchar *(* get_label) (GtkMenuItem *menu_item);
+  const gchar * (* get_label)   (GtkMenuItem *menu_item);
 
   void (* select)               (GtkMenuItem *menu_item);
   void (* deselect)             (GtkMenuItem *menu_item);
@@ -104,34 +102,26 @@ void       gtk_menu_item_toggle_size_request  (GtkMenuItem         *menu_item,
                                                gint                *requisition);
 void       gtk_menu_item_toggle_size_allocate (GtkMenuItem         *menu_item,
                                                gint                 allocation);
+GDK_DEPRECATED_IN_3_2
 void       gtk_menu_item_set_right_justified  (GtkMenuItem         *menu_item,
                                                gboolean             right_justified);
+GDK_DEPRECATED_IN_3_2
 gboolean   gtk_menu_item_get_right_justified  (GtkMenuItem         *menu_item);
-void       gtk_menu_item_set_accel_path       (GtkMenuItem         *menu_item,
+void          gtk_menu_item_set_accel_path    (GtkMenuItem         *menu_item,
                                                const gchar         *accel_path);
-G_CONST_RETURN gchar* gtk_menu_item_get_accel_path (GtkMenuItem    *menu_item);
+const gchar * gtk_menu_item_get_accel_path    (GtkMenuItem    *menu_item);
 
-void       gtk_menu_item_set_label            (GtkMenuItem         *menu_item,
+void          gtk_menu_item_set_label         (GtkMenuItem         *menu_item,
                                                const gchar         *label);
-G_CONST_RETURN gchar *gtk_menu_item_get_label (GtkMenuItem         *menu_item);
+const gchar * gtk_menu_item_get_label         (GtkMenuItem         *menu_item);
 
 void       gtk_menu_item_set_use_underline    (GtkMenuItem         *menu_item,
                                                gboolean             setting);
 gboolean   gtk_menu_item_get_use_underline    (GtkMenuItem         *menu_item);
 
-void       gtk_menu_item_set_reserve_indicator(GtkMenuItem         *menu_item,
-                                              gboolean             reserve);
-gboolean   gtk_menu_item_get_reserve_indicator(GtkMenuItem         *menu_item);
-
-/* private */
-void     _gtk_menu_item_refresh_accel_path   (GtkMenuItem         *menu_item,
-                                              const gchar         *prefix,
-                                              GtkAccelGroup       *accel_group,
-                                              gboolean             group_changed);
-gboolean  _gtk_menu_item_is_selectable        (GtkWidget           *menu_item);
-void      _gtk_menu_item_popup_submenu        (GtkWidget           *menu_item,
-                                               gboolean             with_delay);
-void      _gtk_menu_item_popdown_submenu      (GtkWidget           *menu_item);
+void       gtk_menu_item_set_reserve_indicator (GtkMenuItem        *menu_item,
+                                                gboolean            reserve);
+gboolean   gtk_menu_item_get_reserve_indicator (GtkMenuItem        *menu_item);
 
 G_END_DECLS