Do without GtkSelectionWindow

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

diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index 3ad0a37c7a33b5b4b7d86bf5110724131a33a8b7..f7b6084931994c114b2f773f39331272e5e3cae6 100644 (file)
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -15,9 +15,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/>.
  */
 
 /*
@@ -27,14 +25,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_ACCEL_LABEL_H__
 #define __GTK_ACCEL_LABEL_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtklabel.h>
 
 
@@ -74,9 +72,7 @@ struct _GtkAccelLabelClass
   gchar                *mod_name_control;
   gchar                *mod_name_alt;
   gchar                *mod_separator;
-  gchar                *accel_seperator;
-  guint                 latin1_to_char : 1;
-  
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -94,6 +90,10 @@ void    gtk_accel_label_set_accel_widget  (GtkAccelLabel *accel_label,
 void      gtk_accel_label_set_accel_closure (GtkAccelLabel *accel_label,
                                              GClosure      *accel_closure);
 gboolean   gtk_accel_label_refetch           (GtkAccelLabel *accel_label);
+GDK_AVAILABLE_IN_3_6
+void       gtk_accel_label_set_accel         (GtkAccelLabel   *accel_label,
+                                              guint            accelerator_key,
+                                              GdkModifierType  accelerator_mods);
 
 /* private */
 gchar *    _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass,