X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkfilechooserbutton.h;h=2caadf3927e0fb9765a2c3d2058638af881f9125;hb=HEAD;hp=f6a5bd58c500a55fdefee8fa8bf0d8cd5e1ec6bc;hpb=5e29973773d4e2177f234675cc2a2b2016aa9fbc;p=~andy%2Fgtk

diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h
index f6a5bd58c..2caadf392 100644
--- a/gtk/gtkfilechooserbutton.h
+++ b/gtk/gtkfilechooserbutton.h
@@ -13,19 +13,17 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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_FILE_CHOOSER_BUTTON_H__
+#define __GTK_FILE_CHOOSER_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_FILE_CHOOSER_BUTTON_H__
-#define __GTK_FILE_CHOOSER_BUTTON_H__
-
-#include <gtk/gtkhbox.h>
+#include <gtk/gtkbox.h>
 #include <gtk/gtkfilechooser.h>
 
 G_BEGIN_DECLS
@@ -43,26 +41,24 @@ typedef struct _GtkFileChooserButtonClass   GtkFileChooserButtonClass;
 
 struct _GtkFileChooserButton
 {
-  /*< private >*/
-  GtkHBox parent;
+  GtkBox parent;
 
-  GtkFileChooserButtonPrivate *GSEAL (priv);
+  /*< private >*/
+  GtkFileChooserButtonPrivate *priv;
 };
 
 struct _GtkFileChooserButtonClass
 {
   /*< private >*/
-  GtkHBoxClass parent_class;
+  GtkBoxClass parent_class;
 
   void (* file_set) (GtkFileChooserButton *fc);
 
+  /* Padding for future expansion */
   void (*__gtk_reserved1);
   void (*__gtk_reserved2);
   void (*__gtk_reserved3);
   void (*__gtk_reserved4);
-  void (*__gtk_reserved5);
-  void (*__gtk_reserved6);
-  void (*__gtk_reserved7);
 };
 
 
@@ -70,7 +66,7 @@ GType                 gtk_file_chooser_button_get_type         (void) G_GNUC_CON
 GtkWidget *           gtk_file_chooser_button_new              (const gchar          *title,
 								GtkFileChooserAction  action);
 GtkWidget *           gtk_file_chooser_button_new_with_dialog  (GtkWidget            *dialog);
-G_CONST_RETURN gchar *gtk_file_chooser_button_get_title        (GtkFileChooserButton *button);
+const gchar *         gtk_file_chooser_button_get_title        (GtkFileChooserButton *button);
 void                  gtk_file_chooser_button_set_title        (GtkFileChooserButton *button,
 								const gchar          *title);
 gint                  gtk_file_chooser_button_get_width_chars  (GtkFileChooserButton *button);