filechooserbutton: Give proper names to the SELECT_FOLDER tests with cancelled dialog

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

diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h
index d39648b4585719f20aefdc41ea361ccfc73cd773..fccdef72b1f386a700528e9a04b571133a2ccb83 100644 (file)
--- a/gtk/gtkradioaction.h
+++ b/gtk/gtkradioaction.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/>.
  */
 
 /*
@@ -25,11 +23,16 @@
  * Modified by the GTK+ Team and others 2003.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
+
 #ifndef __GTK_RADIO_ACTION_H__
 #define __GTK_RADIO_ACTION_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtktoggleaction.h>
 
 G_BEGIN_DECLS
@@ -50,7 +53,6 @@ struct _GtkRadioAction
   GtkToggleAction parent;
 
   /*< private >*/
-
   GtkRadioActionPrivate *private_data;
 };
 
@@ -76,6 +78,8 @@ GtkRadioAction *gtk_radio_action_new               (const gchar           *name,
 GSList         *gtk_radio_action_get_group         (GtkRadioAction        *action);
 void            gtk_radio_action_set_group         (GtkRadioAction        *action,
                                                     GSList                *group);
+void            gtk_radio_action_join_group        (GtkRadioAction        *action,
+                                                    GtkRadioAction        *group_source);
 gint            gtk_radio_action_get_current_value (GtkRadioAction        *action);
 void            gtk_radio_action_set_current_value (GtkRadioAction        *action,
                                                     gint                   current_value);