X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkprinteroption.h;h=840ed93b7864ae25b46b0e702649003c8c8ae248;hb=67f5e595a796a8321d6dc7737c58476564998c07;hp=bb3acfbb7e6d31bda0577987426bd1378cf1d0fe;hpb=27f746fbd0e56872a8d3b4bfff2588ad0b7cd7c4;p=~andy%2Fgtk

diff --git a/gtk/gtkprinteroption.h b/gtk/gtkprinteroption.h
index bb3acfbb7..840ed93b7 100644
--- a/gtk/gtkprinteroption.h
+++ b/gtk/gtkprinteroption.h
@@ -13,9 +13,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/>.
  */
 
 #ifndef __GTK_PRINTER_OPTION_H__
@@ -46,8 +44,15 @@ typedef struct _GtkPrinterOptionClass  GtkPrinterOptionClass;
 typedef enum {
   GTK_PRINTER_OPTION_TYPE_BOOLEAN,
   GTK_PRINTER_OPTION_TYPE_PICKONE,
+  GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD,
+  GTK_PRINTER_OPTION_TYPE_PICKONE_PASSCODE,
+  GTK_PRINTER_OPTION_TYPE_PICKONE_REAL,
+  GTK_PRINTER_OPTION_TYPE_PICKONE_INT,
+  GTK_PRINTER_OPTION_TYPE_PICKONE_STRING,
+  GTK_PRINTER_OPTION_TYPE_ALTERNATIVE,
   GTK_PRINTER_OPTION_TYPE_STRING,
-  GTK_PRINTER_OPTION_TYPE_FILESAVE
+  GTK_PRINTER_OPTION_TYPE_FILESAVE,
+  GTK_PRINTER_OPTION_TYPE_INFO
 } GtkPrinterOptionType;
 
 struct _GtkPrinterOption
@@ -64,6 +69,8 @@ struct _GtkPrinterOption
   char **choices;
   char **choices_display;
   
+  gboolean activates_default;
+
   gboolean has_conflict;
   char *group;
 };
@@ -79,31 +86,31 @@ struct _GtkPrinterOptionClass
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
 };
 
 GType   gtk_printer_option_get_type       (void) G_GNUC_CONST;
 
-GtkPrinterOption *gtk_printer_option_new                (const char           *name,
-							 const char           *display_text,
-							 GtkPrinterOptionType  type);
-void              gtk_printer_option_set                (GtkPrinterOption     *option,
-							 const char           *value);
-void              gtk_printer_option_set_has_conflict   (GtkPrinterOption     *option,
-							 gboolean              has_conflict);
-void              gtk_printer_option_clear_has_conflict (GtkPrinterOption     *option);
-void              gtk_printer_option_set_boolean        (GtkPrinterOption     *option,
-							 gboolean              value);
-void              gtk_printer_option_allocate_choices   (GtkPrinterOption     *option,
-							 int                   num);
-void              gtk_printer_option_choices_from_array (GtkPrinterOption     *option,
-							 int                   num_choices,
-							 char                 *choices[],
-							 char                 *choices_display[]);
-gboolean          gtk_printer_option_has_choice         (GtkPrinterOption     *option,
-							 const char           *choice);
+GtkPrinterOption *gtk_printer_option_new                    (const char           *name,
+							     const char           *display_text,
+							     GtkPrinterOptionType  type);
+void              gtk_printer_option_set                    (GtkPrinterOption     *option,
+							     const char           *value);
+void              gtk_printer_option_set_has_conflict       (GtkPrinterOption     *option,
+							     gboolean              has_conflict);
+void              gtk_printer_option_clear_has_conflict     (GtkPrinterOption     *option);
+void              gtk_printer_option_set_boolean            (GtkPrinterOption     *option,
+							     gboolean              value);
+void              gtk_printer_option_allocate_choices       (GtkPrinterOption     *option,
+							     int                   num);
+void              gtk_printer_option_choices_from_array     (GtkPrinterOption     *option,
+							     int                   num_choices,
+							     char                 *choices[],
+							     char                 *choices_display[]);
+gboolean          gtk_printer_option_has_choice             (GtkPrinterOption     *option,
+							    const char           *choice);
+void              gtk_printer_option_set_activates_default (GtkPrinterOption     *option,
+							    gboolean              activates);
+gboolean          gtk_printer_option_get_activates_default (GtkPrinterOption     *option);
 
 
 G_END_DECLS