textview: Use GtkSelectionWindow for touch text selection

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

diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 33fa000dfac341d9ed5573b6d3137cfca280dfd8..94a378244b679ac976cf0c2c5612c3710b3169ee 100644 (file)
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -14,9 +14,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  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/>.
  */
 
 /*
@@ -28,13 +26,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_ACTION_GROUP_H__
+#define __GTK_ACTION_GROUP_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ACTION_GROUP_H__
-#define __GTK_ACTION_GROUP_H__
-
 #include <gtk/gtkaction.h>
 #include <gtk/gtkstock.h>
 
@@ -160,13 +158,19 @@ struct _GtkRadioActionEntry
 
 GType           gtk_action_group_get_type                (void) G_GNUC_CONST;
 GtkActionGroup *gtk_action_group_new                     (const gchar                *name);
-G_CONST_RETURN gchar *gtk_action_group_get_name          (GtkActionGroup             *action_group);
+const gchar    *gtk_action_group_get_name                (GtkActionGroup             *action_group);
 gboolean        gtk_action_group_get_sensitive           (GtkActionGroup             *action_group);
 void            gtk_action_group_set_sensitive           (GtkActionGroup             *action_group,
                                                          gboolean                    sensitive);
 gboolean        gtk_action_group_get_visible             (GtkActionGroup             *action_group);
 void            gtk_action_group_set_visible             (GtkActionGroup             *action_group,
                                                          gboolean                    visible);
+GDK_AVAILABLE_IN_3_6
+GtkAccelGroup  *gtk_action_group_get_accel_group         (GtkActionGroup             *action_group);
+GDK_AVAILABLE_IN_3_6
+void            gtk_action_group_set_accel_group         (GtkActionGroup             *action_group,
+                                                          GtkAccelGroup              *accel_group);
+
 GtkAction      *gtk_action_group_get_action              (GtkActionGroup             *action_group,
                                                          const gchar                *action_name);
 GList          *gtk_action_group_list_actions            (GtkActionGroup             *action_group);
@@ -214,7 +218,7 @@ void            gtk_action_group_set_translate_func      (GtkActionGroup
                                                          GDestroyNotify              notify);
 void            gtk_action_group_set_translation_domain  (GtkActionGroup             *action_group,
                                                          const gchar                *domain);
-G_CONST_RETURN gchar *gtk_action_group_translate_string  (GtkActionGroup             *action_group,
+const gchar *   gtk_action_group_translate_string        (GtkActionGroup             *action_group,
                                                          const gchar                *string);
 
 /* Protected for use by GtkAction */