filechooserbutton: Don't show the (None) item when the combo box is popped up

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

diff --git a/gtk/gtktoggletoolbutton.h b/gtk/gtktoggletoolbutton.h
index 5d8e862167ff9e5b9ee67aa3580c0409bc68219d..13368e97c564e21f96001d55b3af0f3a4ad6aff0 100644 (file)
--- a/gtk/gtktoggletoolbutton.h
+++ b/gtk/gtktoggletoolbutton.h
@@ -1,6 +1,6 @@
 /* gtktoggletoolbutton.h
  *
- * Copyright (C) 2002 Anders Carlsson <andersca@codefactory.se>
+ * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
  * Copyright (C) 2002 James Henstridge <james@daa.com.au>
  * Copyright (C) 2003 Soeren Sandmann <sandmann@daimi.au.dk>
  *
@@ -15,36 +15,37 @@
  * 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/>.
  */
 
 #ifndef __GTK_TOGGLE_TOOL_BUTTON_H__
 #define __GTK_TOGGLE_TOOL_BUTTON_H__
 
-#include "gtktoolbutton.h"
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtktoolbutton.h>
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_TOGGLE_TOOL_BUTTON            (gtk_toggle_tool_button_get_type ())
-#define GTK_TOGGLE_TOOL_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButton))
-#define GTK_TOGGLE_TOOL_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonClass))
-#define GTK_IS_TOGGLE_TOOL_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON))
-#define GTK_IS_TOGGLE_TOOL_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON))
-#define GTK_TOGGLE_TOOL_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonClass))
+#define GTK_TYPE_TOGGLE_TOOL_BUTTON             (gtk_toggle_tool_button_get_type ())
+#define GTK_TOGGLE_TOOL_BUTTON(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButton))
+#define GTK_TOGGLE_TOOL_BUTTON_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonClass))
+#define GTK_IS_TOGGLE_TOOL_BUTTON(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON))
+#define GTK_IS_TOGGLE_TOOL_BUTTON_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOGGLE_TOOL_BUTTON))
+#define GTK_TOGGLE_TOOL_BUTTON_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButtonClass))
 
-typedef struct _GtkToggleToolButton      GtkToggleToolButton;
-typedef struct _GtkToggleToolButtonClass GtkToggleToolButtonClass;
+typedef struct _GtkToggleToolButton        GtkToggleToolButton;
+typedef struct _GtkToggleToolButtonClass   GtkToggleToolButtonClass;
+typedef struct _GtkToggleToolButtonPrivate GtkToggleToolButtonPrivate;
 
 struct _GtkToggleToolButton
 {
   GtkToolButton parent;
 
   /*< private >*/
-  GtkWidget *menu_item;
-
-  guint active : 1;
+  GtkToggleToolButtonPrivate *priv;
 };
 
 struct _GtkToggleToolButtonClass
@@ -53,6 +54,12 @@ struct _GtkToggleToolButtonClass
 
   /* signal */
   void (* toggled) (GtkToggleToolButton *button);
+
+  /* Padding for future expansion */
+  void (* _gtk_reserved1) (void);
+  void (* _gtk_reserved2) (void);
+  void (* _gtk_reserved3) (void);
+  void (* _gtk_reserved4) (void);
 };
 
 GType        gtk_toggle_tool_button_get_type       (void) G_GNUC_CONST;