--- gtkmm-1.3.18/ChangeLog	Sun Jul 14 06:50:40 2002
+++ gtkmm-1.3.18-packoptions/ChangeLog	Thu Jul 18 14:40:42 2002
@@ -1,3 +1,10 @@
+2002-07-18  Michael Babcock  <mbabcock@la.creatureshop.henson.com>
+
+	* gtk/src/: Added new Gtk::PackOptions enumeration for use with
+	Box::pack_start() and Box::pack_end().
+	* demos/: Change demos to use PackOptions instead of AttachOptions.
+	* examples/: ditto
+
 2002-07-14  Murray Cumming  <murrayc@usa.net>
 
 	* examples/book/signals: Added custom signals example.
Only in gtkmm-1.3.18-packoptions/demos: .libs
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: .libs
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: demo
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/demowindow.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/demowindow.cc
--- gtkmm-1.3.18/demos/gtk-demo/demowindow.cc	Sun Jul  7 05:18:51 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/demowindow.cc	Thu Jul 18 10:49:18 2002
@@ -78,7 +78,7 @@
 
   fill_tree();
 
-  m_HBox.pack_start(m_TreeView, Gtk::SHRINK);
+  m_HBox.pack_start(m_TreeView, Gtk::CONTRACT);
 
   //Notebook:
   m_Notebook.append_page(m_TextWidget_Info, "_Info", true);  //true = use mnemonic.
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: demowindow.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: demowindow.o
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_appwindow.o
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/example_buttonbox.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/example_buttonbox.cc
--- gtkmm-1.3.18/demos/gtk-demo/example_buttonbox.cc	Fri May 10 11:58:01 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/example_buttonbox.cc	Thu Jul 18 10:51:02 2002
@@ -37,7 +37,7 @@
 
   add(m_VBox_Main);
 
-  m_VBox_Main.pack_start(m_Frame_Horizontal, Gtk::EXPAND | Gtk::FILL, 10);
+  m_VBox_Main.pack_start(m_Frame_Horizontal, Gtk::EXPAND_WIDGET, 10);
 
   m_VBox.set_border_width(10);
   m_Frame_Horizontal.add(m_VBox);
@@ -47,7 +47,7 @@
   m_VBox.pack_start( *(create_button_box(true, "Start", 40, Gtk::BUTTONBOX_START)) );
   m_VBox.pack_start( *(create_button_box(true, "End", 40, Gtk::BUTTONBOX_END)) );
 
-  m_VBox_Main.pack_start(m_Frame_Vertical, Gtk::EXPAND | Gtk::FILL, 10);
+  m_VBox_Main.pack_start(m_Frame_Vertical, Gtk::EXPAND_WIDGET, 10);
 
   m_VBox.set_border_width(10);
   m_Frame_Vertical.add(m_HBox);
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_buttonbox.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_buttonbox.o
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/example_colorsel.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/example_colorsel.cc
--- gtkmm-1.3.18/demos/gtk-demo/example_colorsel.cc	Sat Jun  8 14:57:16 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/example_colorsel.cc	Thu Jul 18 10:53:14 2002
@@ -67,7 +67,7 @@
 
   m_Alignment.add(m_Button);
 
-  m_VBox.pack_start(m_Alignment,Gtk::SHRINK);
+  m_VBox.pack_start(m_Alignment,Gtk::CONTRACT);
 
   m_Button.signal_clicked().connect(SigC::slot(*this, &Example_ColorSel::on_button_clicked));
 
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_colorsel.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_colorsel.o
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/example_dialog.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/example_dialog.cc
--- gtkmm-1.3.18/demos/gtk-demo/example_dialog.cc	Fri May 10 11:58:01 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/example_dialog.cc	Thu Jul 18 10:54:12 2002
@@ -76,22 +76,22 @@
 
 
   /* Standard message dialog */
-  m_VBox.pack_start(m_HBox, Gtk::SHRINK);
+  m_VBox.pack_start(m_HBox, Gtk::CONTRACT);
   m_Button_Message.signal_clicked().connect(SigC::slot(*this, &Example_Dialog::on_button_message));
-  m_HBox.pack_start(m_Button_Message, Gtk::SHRINK);
-  m_VBox.pack_start(*(Gtk::manage(new Gtk::HSeparator())), Gtk::SHRINK);
+  m_HBox.pack_start(m_Button_Message, Gtk::CONTRACT);
+  m_VBox.pack_start(*(Gtk::manage(new Gtk::HSeparator())), Gtk::CONTRACT);
 
 
   /* Interactive dialog*/
-  m_VBox.pack_start(m_HBox2, Gtk::SHRINK);
+  m_VBox.pack_start(m_HBox2, Gtk::CONTRACT);
   m_Button_Interactive.signal_clicked().connect(SigC::slot(*this, &Example_Dialog::on_button_interactive));
-  m_HBox2.pack_start(m_VBox2, Gtk::SHRINK);
-  m_VBox2.pack_start(m_Button_Interactive, Gtk::SHRINK);
+  m_HBox2.pack_start(m_VBox2, Gtk::CONTRACT);
+  m_VBox2.pack_start(m_Button_Interactive, Gtk::CONTRACT);
 
 
   m_Table.set_row_spacings(4);
   m_Table.set_col_spacings(4);
-  m_HBox2.pack_start(m_Table, Gtk::SHRINK);
+  m_HBox2.pack_start(m_Table, Gtk::CONTRACT);
 
   m_Table.attach(m_Label1, 0, 1, 0, 1);
   m_Table.attach(m_Entry1, 1, 2, 0, 1);
@@ -143,8 +143,8 @@
   add_button("_Non-stock Button", Gtk::RESPONSE_CANCEL);
 
   m_HBox.set_border_width(8);
-  get_vbox()->pack_start(m_HBox, Gtk::SHRINK);
-  m_HBox.pack_start(m_Image, Gtk::SHRINK);
+  get_vbox()->pack_start(m_HBox, Gtk::CONTRACT);
+  m_HBox.pack_start(m_Image, Gtk::CONTRACT);
 
   m_Table.set_row_spacings(4);
   m_Table.set_col_spacings(4);
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_dialog.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_dialog.o
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/example_drawingarea.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/example_drawingarea.cc
--- gtkmm-1.3.18/demos/gtk-demo/example_drawingarea.cc	Sun May 19 19:07:18 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/example_drawingarea.cc	Thu Jul 18 10:54:45 2002
@@ -60,7 +60,7 @@
    */
 
   m_Label_Checkerboard.set_markup("<u>Checkerboard pattern</u>");
-  m_VBox.pack_start(m_Label_Checkerboard, Gtk::SHRINK);
+  m_VBox.pack_start(m_Label_Checkerboard, Gtk::CONTRACT);
 
   m_Frame_Checkerboard.set_shadow_type(Gtk::SHADOW_IN);
   m_VBox.pack_start(m_Frame_Checkerboard);
@@ -78,7 +78,7 @@
    */
 
   m_Label_Scribble.set_markup("<u>Scribble area</u>");
-  m_VBox.pack_start(m_Label_Scribble, Gtk::SHRINK);
+  m_VBox.pack_start(m_Label_Scribble, Gtk::CONTRACT);
 
   m_Frame_Scribble.set_shadow_type(Gtk::SHADOW_IN);
   m_VBox.pack_start(m_Frame_Scribble);
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_drawingarea.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_drawingarea.o
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/example_images.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/example_images.cc
--- gtkmm-1.3.18/demos/gtk-demo/example_images.cc	Mon May 20 12:21:53 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/example_images.cc	Thu Jul 18 10:55:26 2002
@@ -65,7 +65,7 @@
   /* Image */
 
   m_Label_Image.set_markup("<u>Image loaded from a file</u>");
-  m_VBox.pack_start(m_Label_Image, Gtk::SHRINK);
+  m_VBox.pack_start(m_Label_Image, Gtk::CONTRACT);
 
   m_Frame_Image.set_shadow_type(Gtk::SHADOW_IN);
 
@@ -73,7 +73,7 @@
    * the window
    */
   m_Alignment_Image.add(m_Frame_Image);
-  m_VBox.pack_start(m_Alignment_Image, Gtk::SHRINK);
+  m_VBox.pack_start(m_Alignment_Image, Gtk::CONTRACT);
 
   Gtk::Image* pImage = Gtk::manage( new Gtk::Image(Glib::ustring("./gtk-logo-rgb.gif")) );		
   m_Frame_Image.add(*pImage);
@@ -82,7 +82,7 @@
   /* Animation */
 
   m_Label_Animation.set_markup("<u>Animation loaded from a file</u>");
-  m_VBox.pack_start(m_Label_Animation, Gtk::SHRINK);
+  m_VBox.pack_start(m_Label_Animation, Gtk::CONTRACT);
 
   m_Frame_Animation.set_shadow_type(Gtk::SHADOW_IN);
 
@@ -90,7 +90,7 @@
   * the window
   */
   m_Alignment_Animation.add(m_Frame_Animation);
-  m_VBox.pack_start(m_Alignment_Animation, Gtk::SHRINK);
+  m_VBox.pack_start(m_Alignment_Animation, Gtk::CONTRACT);
 
   pImage = Gtk::manage( new Gtk::Image(Glib::ustring("./floppybuddy.gif")) );		
   m_Frame_Animation.add(*pImage);
@@ -99,7 +99,7 @@
   /* Progressive */
 
   m_Label_Progressive.set_markup("<u>Progressive image loading</u>");
-  m_VBox.pack_start(m_Label_Progressive, Gtk::SHRINK);
+  m_VBox.pack_start(m_Label_Progressive, Gtk::CONTRACT);
 
   m_Frame_Progressive.set_shadow_type(Gtk::SHADOW_IN);
 
@@ -107,7 +107,7 @@
   * the window
   */
   m_Alignment_Progressive.add(m_Frame_Progressive);
-  m_VBox.pack_start(m_Alignment_Progressive, Gtk::SHRINK);
+  m_VBox.pack_start(m_Alignment_Progressive, Gtk::CONTRACT);
 
   /* Create an empty image for now; the progressive loader
    * will create the pixbuf and fill it in.
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_images.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_images.o
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/example_menus.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/example_menus.cc
--- gtkmm-1.3.18/demos/gtk-demo/example_menus.cc	Sat Jun 22 08:26:20 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/example_menus.cc	Thu Jul 18 10:57:17 2002
@@ -68,7 +68,7 @@
 
   add(m_VBox1);
 
-  m_VBox1.pack_start(m_MenuBar, Gtk::FILL);
+  m_VBox1.pack_start(m_MenuBar, Gtk::CONTRACT);
 
   {
     using namespace Gtk::Menu_Helpers;
@@ -111,11 +111,11 @@
     m_VBox_Sub1.pack_start(m_OptionMenu);
   }
 
-  m_VBox1.pack_start(m_Separator, Gtk::FILL);
+  m_VBox1.pack_start(m_Separator, Gtk::CONTRACT);
 
 
   m_VBox_Sub2.set_border_width(10);
-  m_VBox1.pack_start(m_VBox_Sub2, Gtk::FILL);
+  m_VBox1.pack_start(m_VBox_Sub2, Gtk::CONTRACT);
 
   m_Button.signal_clicked().connect(SigC::slot(*this, &Example_Menus::on_button_clicked));
 
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_menus.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_menus.o
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/example_panes.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/example_panes.cc
--- gtkmm-1.3.18/demos/gtk-demo/example_panes.cc	Thu May 23 03:46:21 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/example_panes.cc	Thu Jul 18 10:58:42 2002
@@ -76,8 +76,8 @@
   pFrame3->set_size_request(60, 80);
 
   // Now create check buttons to control sizing
-  pVBox->pack_start(*Gtk::manage(new PaneOptions(*pHPaned, "Horizontal", "Left", "Right")), Gtk::SHRINK);
-  pVBox->pack_start(*Gtk::manage(new PaneOptions(*pVPaned, "Vertical", "Top", "Bottom")),   Gtk::SHRINK);
+  pVBox->pack_start(*Gtk::manage(new PaneOptions(*pHPaned, "Horizontal", "Left", "Right")), Gtk::CONTRACT);
+  pVBox->pack_start(*Gtk::manage(new PaneOptions(*pVPaned, "Vertical", "Top", "Bottom")),   Gtk::CONTRACT);
 
   show_all();
 }
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_panes.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_panes.o
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_pixbufs.o
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/example_sizegroup.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/example_sizegroup.cc
--- gtkmm-1.3.18/demos/gtk-demo/example_sizegroup.cc	Sat Jun  8 15:34:18 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/example_sizegroup.cc	Thu Jul 18 10:59:59 2002
@@ -82,7 +82,7 @@
 
   /* And another frame holding line style options
    */
-  m_VBox.pack_start(m_Frame_Line, Gtk::SHRINK);
+  m_VBox.pack_start(m_Frame_Line, Gtk::CONTRACT);
 
   m_Table_Line.set_border_width(5);
   m_Table_Line.set_row_spacings(5);
@@ -105,7 +105,7 @@
   add_row(m_Table_Line, 1, m_refSizeGroup, "_Line ends", end_options);
 
   /* And a check button to turn grouping on and off */
-  m_VBox.pack_start(m_CheckButton, Gtk::SHRINK);
+  m_VBox.pack_start(m_CheckButton, Gtk::CONTRACT);
   m_CheckButton.set_active();
   m_CheckButton.signal_toggled().connect(SigC::slot(*this, &Example_SizeGroup::on_checkbutton_toggled));
 
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_sizegroup.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_sizegroup.o
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/example_stockbrowser.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/example_stockbrowser.cc
--- gtkmm-1.3.18/demos/gtk-demo/example_stockbrowser.cc	Sun Jun 23 08:28:09 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/example_stockbrowser.cc	Thu Jul 18 11:01:32 2002
@@ -74,7 +74,7 @@
 
   add(m_HBox);
   m_ScrolledWindow.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
-  m_HBox.pack_start(m_ScrolledWindow, Gtk::SHRINK);
+  m_HBox.pack_start(m_ScrolledWindow, Gtk::CONTRACT);
 
   // create the TreeModel with all the stock item data in it
   m_refTreeModel = create_model();
@@ -115,11 +115,11 @@
   m_VBox.set_border_width(4);
   m_Frame.add(m_VBox);
 
-  m_VBox.pack_start(m_Label_Type, Gtk::SHRINK);
-  m_VBox.pack_start(m_Image, Gtk::SHRINK);
-  m_VBox.pack_start(m_Label_Accel, Gtk::SHRINK);
-  m_VBox.pack_start(m_Label_Symbol, Gtk::SHRINK);
-  m_VBox.pack_start(m_Label_ID, Gtk::SHRINK);
+  m_VBox.pack_start(m_Label_Type, Gtk::CONTRACT);
+  m_VBox.pack_start(m_Image, Gtk::CONTRACT);
+  m_VBox.pack_start(m_Label_Accel, Gtk::CONTRACT);
+  m_VBox.pack_start(m_Label_Symbol, Gtk::CONTRACT);
+  m_VBox.pack_start(m_Label_ID, Gtk::CONTRACT);
 
   m_refTreeSelection = m_TreeView.get_selection();
   m_refTreeSelection->set_mode(Gtk::SELECTION_SINGLE);
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_stockbrowser.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_stockbrowser.o
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_textview.o
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/example_treeview_editable_cells.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/example_treeview_editable_cells.cc
--- gtkmm-1.3.18/demos/gtk-demo/example_treeview_editable_cells.cc	Fri Jul 12 04:55:42 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/example_treeview_editable_cells.cc	Thu Jul 18 11:02:22 2002
@@ -108,7 +108,7 @@
   set_default_size(320, 200);
 
   add(m_VBox);
-  m_VBox.pack_start(m_Label, Gtk::SHRINK);
+  m_VBox.pack_start(m_Label, Gtk::CONTRACT);
 
   m_ScrolledWindow.set_shadow_type(Gtk::SHADOW_ETCHED_IN);
   m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
@@ -127,7 +127,7 @@
   m_ScrolledWindow.add(m_TreeView);
 
   /* some buttons */
-  m_VBox.pack_start(m_HBox, Gtk::SHRINK);
+  m_VBox.pack_start(m_HBox, Gtk::CONTRACT);
 
   m_HBox.pack_start(m_Button_Add);
   m_Button_Add.signal_clicked().connect(
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_treeview_editable_cells.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_treeview_editable_cells.o
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/example_treeview_liststore.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/example_treeview_liststore.cc
--- gtkmm-1.3.18/demos/gtk-demo/example_treeview_liststore.cc	Wed Jul 10 10:50:39 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/example_treeview_liststore.cc	Thu Jul 18 11:02:59 2002
@@ -113,7 +113,7 @@
   set_default_size(280, 250);
 
   add(m_VBox);
-  m_VBox.pack_start(m_Label, Gtk::SHRINK);
+  m_VBox.pack_start(m_Label, Gtk::CONTRACT);
 
   m_ScrolledWindow.set_shadow_type(Gtk::SHADOW_ETCHED_IN);
   m_ScrolledWindow.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_treeview_liststore.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_treeview_liststore.o
diff -ur -x Makefile gtkmm-1.3.18/demos/gtk-demo/example_treeview_treestore.cc gtkmm-1.3.18-packoptions/demos/gtk-demo/example_treeview_treestore.cc
--- gtkmm-1.3.18/demos/gtk-demo/example_treeview_treestore.cc	Wed Jul 10 10:50:24 2002
+++ gtkmm-1.3.18-packoptions/demos/gtk-demo/example_treeview_treestore.cc	Thu Jul 18 11:03:31 2002
@@ -157,7 +157,7 @@
   set_default_size(650, 400);
 
   add(m_VBox);
-  m_VBox.pack_start(m_Label, Gtk::SHRINK);
+  m_VBox.pack_start(m_Label, Gtk::CONTRACT);
 
   m_ScrolledWindow.set_shadow_type(Gtk::SHADOW_ETCHED_IN);
   m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_treeview_treestore.cc~
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: example_treeview_treestore.o
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: main.o
Only in gtkmm-1.3.18-packoptions/demos/gtk-demo: textwidget.o
Only in gtkmm-1.3.18-packoptions/demos: pixbuf-demo
Only in gtkmm-1.3.18-packoptions/demos: pixbuf-demo.o
Only in gtkmm-1.3.18-packoptions/examples: Makefile~
Only in gtkmm-1.3.18-packoptions/examples/arrow: .libs
Only in gtkmm-1.3.18-packoptions/examples/arrow: arrow
diff -ur -x Makefile gtkmm-1.3.18/examples/arrow/arrow.cc gtkmm-1.3.18-packoptions/examples/arrow/arrow.cc
--- gtkmm-1.3.18/examples/arrow/arrow.cc	Fri May 10 11:58:05 2002
+++ gtkmm-1.3.18-packoptions/examples/arrow/arrow.cc	Thu Jul 18 11:10:00 2002
@@ -47,16 +47,16 @@
 
   /* Pack and show all our widgets */
   button = manage (new ArrowButton (Gtk::ARROW_LEFT, Gtk::SHADOW_ETCHED_IN));
-  box->pack_start (*button, Gtk::SHRINK, 3);
+  box->pack_start (*button, Gtk::CONTRACT, 3);
 
   button = manage(new ArrowButton (Gtk::ARROW_RIGHT, Gtk::SHADOW_ETCHED_IN));
-  box->pack_start(*button, Gtk::SHRINK, 3);
+  box->pack_start(*button, Gtk::CONTRACT, 3);
 
   button = manage (new ArrowButton (Gtk::ARROW_LEFT, Gtk::SHADOW_ETCHED_OUT));
-  box->pack_start (*button, Gtk::SHRINK, 3);
+  box->pack_start (*button, Gtk::CONTRACT, 3);
 
   button = manage (new ArrowButton (Gtk::ARROW_RIGHT, Gtk::SHADOW_ETCHED_OUT));
-  box->pack_start (*button, Gtk::SHRINK, 3);
+  box->pack_start (*button, Gtk::CONTRACT, 3);
  
   add (*box);
   show_all ();
Only in gtkmm-1.3.18-packoptions/examples/arrow: arrow.cc~
Only in gtkmm-1.3.18-packoptions/examples/arrow: arrow.o
Only in gtkmm-1.3.18-packoptions/examples/arrow: direction
Only in gtkmm-1.3.18-packoptions/examples/arrow: direction.o
Only in gtkmm-1.3.18-packoptions/examples/aspectframe: .libs
Only in gtkmm-1.3.18-packoptions/examples/aspectframe: aspectframe
Only in gtkmm-1.3.18-packoptions/examples/aspectframe: aspectframe.o
Only in gtkmm-1.3.18-packoptions/examples/book/buttons/button: .libs
Only in gtkmm-1.3.18-packoptions/examples/book/buttons/button: buttons
Only in gtkmm-1.3.18-packoptions/examples/book/buttons/button: buttons.o
Only in gtkmm-1.3.18-packoptions/examples/book/buttons/button: main.o
Only in gtkmm-1.3.18-packoptions/examples/book/buttons/radiobutton: .libs
Only in gtkmm-1.3.18-packoptions/examples/book/buttons/radiobutton: main.o
Only in gtkmm-1.3.18-packoptions/examples/book/buttons/radiobutton: radiobuttons
diff -ur -x Makefile gtkmm-1.3.18/examples/book/buttons/radiobutton/radiobuttons.cc gtkmm-1.3.18-packoptions/examples/book/buttons/radiobutton/radiobuttons.cc
--- gtkmm-1.3.18/examples/book/buttons/radiobutton/radiobuttons.cc	Tue Jul  9 05:21:00 2002
+++ gtkmm-1.3.18-packoptions/examples/book/buttons/radiobutton/radiobuttons.cc	Thu Jul 18 11:06:45 2002
@@ -48,11 +48,11 @@
   m_RadioButton2.set_active();
 
   //Add a separator:
-  m_Box_Top.pack_start(m_Separator, Gtk::FILL);
+  m_Box_Top.pack_start(m_Separator, Gtk::CONTRACT);
 
   //Put Box2 in m_Box_Top:
   m_Box2.set_border_width(10);
-  m_Box_Top.pack_start(m_Box2, Gtk::FILL);
+  m_Box_Top.pack_start(m_Box2, Gtk::CONTRACT);
 
   //Put Close button in Box2:
   m_Box2.pack_start(m_Button_Close);
Only in gtkmm-1.3.18-packoptions/examples/book/buttons/radiobutton: radiobuttons.cc~
Only in gtkmm-1.3.18-packoptions/examples/book/buttons/radiobutton: radiobuttons.o
Only in gtkmm-1.3.18-packoptions/examples/book/drag_and_drop: .libs
Only in gtkmm-1.3.18-packoptions/examples/book/drag_and_drop: dndwindow.o
Only in gtkmm-1.3.18-packoptions/examples/book/drag_and_drop: drag_and_drop
Only in gtkmm-1.3.18-packoptions/examples/book/drag_and_drop: main.o
Only in gtkmm-1.3.18-packoptions/examples/book/drawingarea: .libs
Only in gtkmm-1.3.18-packoptions/examples/book/drawingarea: drawingarea
Only in gtkmm-1.3.18-packoptions/examples/book/drawingarea: main.o
Only in gtkmm-1.3.18-packoptions/examples/book/drawingarea: myarea.o
Only in gtkmm-1.3.18-packoptions/examples/book/helloworld: .libs
Only in gtkmm-1.3.18-packoptions/examples/book/helloworld: helloworld
Only in gtkmm-1.3.18-packoptions/examples/book/helloworld: helloworld.o
Only in gtkmm-1.3.18-packoptions/examples/book/helloworld: main.o
Only in gtkmm-1.3.18-packoptions/examples/book/helloworld2: .libs
Only in gtkmm-1.3.18-packoptions/examples/book/helloworld2: helloworld.o
Only in gtkmm-1.3.18-packoptions/examples/book/helloworld2: helloworld2
Only in gtkmm-1.3.18-packoptions/examples/book/helloworld2: main.o
Only in gtkmm-1.3.18-packoptions/examples/book/menus/main_menu: .libs
diff -ur -x Makefile gtkmm-1.3.18/examples/book/menus/main_menu/examplewindow.cc gtkmm-1.3.18-packoptions/examples/book/menus/main_menu/examplewindow.cc
--- gtkmm-1.3.18/examples/book/menus/main_menu/examplewindow.cc	Sat Jul 13 08:58:34 2002
+++ gtkmm-1.3.18-packoptions/examples/book/menus/main_menu/examplewindow.cc	Thu Jul 18 11:08:18 2002
@@ -63,7 +63,7 @@
   m_MenuBar.items().push_back( Gtk::Menu_Helpers::MenuElem("_Edit", m_Menu_Edit) );
 
   //Add the MenuBar to the window:
-  m_Box.pack_start(m_MenuBar, Gtk::SHRINK);
+  m_Box.pack_start(m_MenuBar, Gtk::CONTRACT);
 
   show_all_children();
 }
Only in gtkmm-1.3.18-packoptions/examples/book/menus/main_menu: examplewindow.cc~
Only in gtkmm-1.3.18-packoptions/examples/book/menus/main_menu: examplewindow.o
Only in gtkmm-1.3.18-packoptions/examples/book/menus/main_menu: main.o
Only in gtkmm-1.3.18-packoptions/examples/book/menus/main_menu: main_menu
Only in gtkmm-1.3.18-packoptions/examples/book/menus/popup: .libs
Only in gtkmm-1.3.18-packoptions/examples/book/menus/popup: examplewindow.o
Only in gtkmm-1.3.18-packoptions/examples/book/menus/popup: main.o
Only in gtkmm-1.3.18-packoptions/examples/book/menus/popup: popup
Only in gtkmm-1.3.18-packoptions/examples/book/signals/custom: .libs
Only in gtkmm-1.3.18-packoptions/examples/book/signals/custom: client.o
Only in gtkmm-1.3.18-packoptions/examples/book/signals/custom: example
Only in gtkmm-1.3.18-packoptions/examples/book/signals/custom: main.o
Only in gtkmm-1.3.18-packoptions/examples/book/signals/custom: server.o
Only in gtkmm-1.3.18-packoptions/examples/book/timeout: .libs
Only in gtkmm-1.3.18-packoptions/examples/book/timeout: main.o
Only in gtkmm-1.3.18-packoptions/examples/book/timeout: timeout
Only in gtkmm-1.3.18-packoptions/examples/book/timeout: timerexample.o
Only in gtkmm-1.3.18-packoptions/examples/buttonbox: .libs
Only in gtkmm-1.3.18-packoptions/examples/buttonbox: buttonbox
diff -ur -x Makefile gtkmm-1.3.18/examples/buttonbox/buttonbox.cc gtkmm-1.3.18-packoptions/examples/buttonbox/buttonbox.cc
--- gtkmm-1.3.18/examples/buttonbox/buttonbox.cc	Fri May 10 11:58:11 2002
+++ gtkmm-1.3.18-packoptions/examples/buttonbox/buttonbox.cc	Thu Jul 18 11:12:05 2002
@@ -71,7 +71,7 @@
   add (*main_vbox);
 
   frame_horz = manage( new Gtk::Frame ("Horizontal Button Boxes") );
-  main_vbox->pack_start (*frame_horz, Gtk::EXPAND | Gtk::FILL, 10);
+  main_vbox->pack_start (*frame_horz, Gtk::EXPAND_WIDGET, 10);
 
   vbox = manage( new Gtk::VBox (false, 0) );
   vbox -> set_border_width (10);
@@ -79,22 +79,22 @@
 
   vbox->pack_start (*manage( new BBox (true, "Spread (spacing 40)", 
                                       40, Gtk::BUTTONBOX_SPREAD)),
-		      Gtk::EXPAND | Gtk::FILL, 0);
+		      Gtk::EXPAND_WIDGET, 0);
 
   vbox->pack_start (*manage( new BBox (true, "Edge (spacing 30)", 
 	                              30, Gtk::BUTTONBOX_EDGE)),
-		      Gtk::EXPAND | Gtk::FILL, 5);
+		      Gtk::EXPAND_WIDGET, 5);
 
   vbox->pack_start (*manage( new BBox (true, "Start (spacing 20)", 
                                       20, Gtk::BUTTONBOX_START)),
-		      Gtk::EXPAND | Gtk::FILL, 5);
+		      Gtk::EXPAND_WIDGET, 5);
 
   vbox->pack_start (*manage( new BBox (true, "end (spacing 10)", 
                                       10, Gtk::BUTTONBOX_END)),
-		      Gtk::EXPAND | Gtk::FILL, 5);
+		      Gtk::EXPAND_WIDGET, 5);
 
   frame_vert = manage( new Gtk::Frame ("Vertical Button Boxes") );
-  main_vbox->pack_start (*frame_vert, Gtk::EXPAND | Gtk::FILL, 10);
+  main_vbox->pack_start (*frame_vert, Gtk::EXPAND_WIDGET, 10);
 
   hbox = manage( new Gtk::HBox (false, 0) );
   hbox->set_border_width (10);
@@ -102,19 +102,19 @@
 
   hbox->pack_start (*manage( new BBox (false, "Spread (spacing 5)", 
                                       5, Gtk::BUTTONBOX_SPREAD)),
-		      Gtk::EXPAND | Gtk::FILL, 0);
+		      Gtk::EXPAND_WIDGET, 0);
 
   hbox->pack_start (*manage( new BBox (false, "Edge (spacing 30)", 
 	                              30, Gtk::BUTTONBOX_EDGE)),
-		      Gtk::EXPAND | Gtk::FILL, 5);
+		      Gtk::EXPAND_WIDGET, 5);
 
   hbox->pack_start (*manage( new BBox (false, "Start (spacing 20)", 
                                       20, Gtk::BUTTONBOX_START)),
-		      Gtk::EXPAND | Gtk::FILL, 5);
+		      Gtk::EXPAND_WIDGET, 5);
 
   hbox->pack_start (*manage( new BBox (false, "End (spacing 10)", 
                                       10, Gtk::BUTTONBOX_END)),
-		      Gtk::EXPAND | Gtk::FILL, 5);
+		      Gtk::EXPAND_WIDGET, 5);
 
   show_all ();
 
Only in gtkmm-1.3.18-packoptions/examples/buttonbox: buttonbox.cc~
Only in gtkmm-1.3.18-packoptions/examples/buttonbox: buttonbox.o
Only in gtkmm-1.3.18-packoptions/examples/calendar: .libs
Only in gtkmm-1.3.18-packoptions/examples/calendar: calendar
diff -ur -x Makefile gtkmm-1.3.18/examples/calendar/calendar.cc gtkmm-1.3.18-packoptions/examples/calendar/calendar.cc
--- gtkmm-1.3.18/examples/calendar/calendar.cc	Fri Jun 14 03:58:27 2002
+++ gtkmm-1.3.18-packoptions/examples/calendar/calendar.cc	Thu Jul 18 11:13:58 2002
@@ -224,15 +224,15 @@
    */
 
   Gtk::HBox* hbox = manage(new Gtk::HBox(false, DEF_PAD));
-  vbox->pack_start(*hbox, Gtk::EXPAND | Gtk::FILL, DEF_PAD);
+  vbox->pack_start(*hbox, Gtk::EXPAND_WIDGET, DEF_PAD);
   Gtk::HButtonBox* hbbox = manage(new Gtk::HButtonBox());
-  hbox->pack_start(*hbbox, Gtk::SHRINK, DEF_PAD);
+  hbox->pack_start(*hbbox, Gtk::CONTRACT, DEF_PAD);
   hbbox->set_layout(Gtk::BUTTONBOX_SPREAD);
   hbbox->set_spacing(5);
 
   /* Calendar widget */
   Gtk::Frame* frame = manage(new Gtk::Frame("Calendar"));
-  hbbox->pack_start(*frame, Gtk::EXPAND | Gtk::FILL, DEF_PAD);
+  hbbox->pack_start(*frame, Gtk::EXPAND_WIDGET, DEF_PAD);
   calendar_ = new Gtk::Calendar();
   set_flags();
   calendar_->mark_day(19);	
@@ -242,15 +242,15 @@
   calendar_->signal_day_selected_double_click().connect(slot(*this, &CalendarExample::day_selected_double_click));
 
   Gtk::VSeparator* separator = manage(new Gtk::VSeparator());
-  hbox->pack_start (*separator, Gtk::FILL);
+  hbox->pack_start (*separator, Gtk::CONTRACT);
 
   Gtk::VBox* vbox2 = manage(new Gtk::VBox(false, DEF_PAD));
-  hbox->pack_start(*vbox2, Gtk::SHRINK, DEF_PAD);
+  hbox->pack_start(*vbox2, Gtk::CONTRACT, DEF_PAD);
   
   /* Build the Right frame with the flags in */ 
 
   Gtk::Frame* frameFlags = manage(new Gtk::Frame("Flags"));
-  vbox2->pack_start(*frameFlags, Gtk::EXPAND | Gtk::FILL, DEF_PAD);
+  vbox2->pack_start(*frameFlags, Gtk::EXPAND_WIDGET, DEF_PAD);
   Gtk::VBox* vbox3 = manage(new Gtk::VBox(true, DEF_PAD_SMALL));
   frameFlags->add(*vbox3);
 
@@ -276,40 +276,40 @@
   /* Build the right font-button */ 
   Gtk::Button* button = manage(new Gtk::Button("Font..."));
   button->signal_clicked().connect(slot(*this, &CalendarExample::select_font));
-  vbox2->pack_start (*button, Gtk::SHRINK);
+  vbox2->pack_start (*button, Gtk::CONTRACT);
 
   /*
    *  Build the Signal-event part.
    */
 
   frame = manage(new Gtk::Frame("Signal events"));
-  vbox->pack_start(*frame, Gtk::EXPAND | Gtk::FILL, DEF_PAD);
+  vbox->pack_start(*frame, Gtk::EXPAND_WIDGET, DEF_PAD);
   vbox2 = manage(new Gtk::VBox(true, DEF_PAD_SMALL));
   frame->add(*vbox2);
   
   hbox = manage(new Gtk::HBox(false, 5));
-  vbox2->pack_start (*hbox, Gtk::FILL);
+  vbox2->pack_start (*hbox, Gtk::CONTRACT);
   Gtk::Label* label = manage(new Gtk::Label("Day selected:"));
-  hbox->pack_start (*label, Gtk::FILL);
+  hbox->pack_start (*label, Gtk::CONTRACT);
   label_selected_ = new Gtk::Label("");
-  hbox->pack_start (*label_selected_, Gtk::FILL);
+  hbox->pack_start (*label_selected_, Gtk::CONTRACT);
 
   hbox = manage(new Gtk::HBox(false, 5));
-  vbox2->pack_start (*hbox, Gtk::FILL);
+  vbox2->pack_start (*hbox, Gtk::CONTRACT);
   label = manage(new Gtk::Label("Day selected double click:"));
-  hbox->pack_start (*label, Gtk::FILL);
+  hbox->pack_start (*label, Gtk::CONTRACT);
   label_selected_double_click_ = new Gtk::Label("");
-  hbox->pack_start (*label_selected_double_click_, Gtk::FILL);
+  hbox->pack_start (*label_selected_double_click_, Gtk::CONTRACT);
 
   hbox = manage(new Gtk::HBox(false, 5));
-  vbox2->pack_start (*hbox, Gtk::FILL);
+  vbox2->pack_start (*hbox, Gtk::CONTRACT);
   label = manage(new Gtk::Label("Month change:")); 
-  hbox->pack_start (*label, Gtk::FILL);
+  hbox->pack_start (*label, Gtk::CONTRACT);
   label_month_ = new Gtk::Label("");
-  hbox->pack_start(*label_month_, Gtk::FILL);
+  hbox->pack_start(*label_month_, Gtk::CONTRACT);
   
   Gtk::HButtonBox* bbox = manage(new Gtk::HButtonBox());
-  vbox->pack_start(*bbox, Gtk::SHRINK);
+  vbox->pack_start(*bbox, Gtk::CONTRACT);
   bbox->set_layout(Gtk::BUTTONBOX_END);
 
   button = manage(new Gtk::Button("Close"));
Only in gtkmm-1.3.18-packoptions/examples/calendar: calendar.cc~
Only in gtkmm-1.3.18-packoptions/examples/calendar: calendar.o
Only in gtkmm-1.3.18-packoptions/examples/cellrenderercustom: .libs
Only in gtkmm-1.3.18-packoptions/examples/cellrenderercustom: cellrendererlist.o
Only in gtkmm-1.3.18-packoptions/examples/cellrenderercustom: cellrendererpopup.o
Only in gtkmm-1.3.18-packoptions/examples/cellrenderercustom: cellrenderertoggle
Only in gtkmm-1.3.18-packoptions/examples/cellrenderercustom: cellrenderertoggle.o
diff -ur -x Makefile gtkmm-1.3.18/examples/cellrenderercustom/popupentry.cc gtkmm-1.3.18-packoptions/examples/cellrenderercustom/popupentry.cc
--- gtkmm-1.3.18/examples/cellrenderercustom/popupentry.cc	Fri Jun 14 03:58:28 2002
+++ gtkmm-1.3.18-packoptions/examples/cellrenderercustom/popupentry.cc	Thu Jul 18 11:15:29 2002
@@ -19,12 +19,12 @@
   add(*Gtk::manage(hbox));
 
   entry_ = new Gtk::Entry();
-  hbox->pack_start(*Gtk::manage(entry_), Gtk::EXPAND | Gtk::FILL);
+  hbox->pack_start(*Gtk::manage(entry_), Gtk::EXPAND_WIDGET);
   entry_->set_has_frame(false);
   entry_->gobj()->is_cell_renderer = true; // XXX
 
   button_ = new Gtk::Button();
-  hbox->pack_start(*Gtk::manage(button_), Gtk::FILL);
+  hbox->pack_start(*Gtk::manage(button_), Gtk::CONTRACT);
   button_->add(*Gtk::manage(new Gtk::Arrow(Gtk::ARROW_DOWN, Gtk::SHADOW_OUT)));
 
   set_flags(Gtk::CAN_FOCUS);
Only in gtkmm-1.3.18-packoptions/examples/cellrenderercustom: popupentry.cc~
Only in gtkmm-1.3.18-packoptions/examples/cellrenderercustom: popupentry.o
Only in gtkmm-1.3.18-packoptions/examples/cellrenderercustom: testpopup
Only in gtkmm-1.3.18-packoptions/examples/cellrenderercustom: testpopup.o
Only in gtkmm-1.3.18-packoptions/examples/dialog: .libs
Only in gtkmm-1.3.18-packoptions/examples/dialog: dialog1
Only in gtkmm-1.3.18-packoptions/examples/dialog: dialog1.o
Only in gtkmm-1.3.18-packoptions/examples/dialog: dialog2
diff -ur -x Makefile gtkmm-1.3.18/examples/dialog/dialog2.cc gtkmm-1.3.18-packoptions/examples/dialog/dialog2.cc
--- gtkmm-1.3.18/examples/dialog/dialog2.cc	Mon May 20 12:22:00 2002
+++ gtkmm-1.3.18-packoptions/examples/dialog/dialog2.cc	Thu Jul 18 11:16:49 2002
@@ -164,7 +164,7 @@
     mainBox->pack_start(*leftBox);
 
     Box* centralBox = manage(new VBox);
-    mainBox->pack_start(*centralBox, Gtk::FILL);
+    mainBox->pack_start(*centralBox, Gtk::CONTRACT);
 
     Box* topBox = manage(new HBox);
     centralBox->pack_start(*topBox);
@@ -209,11 +209,11 @@
       ->signal_clicked().connect(bind(slot(*dialog, &MyDialog::CenterOverWidget),
                              eventBox));
 
-    centralBox->pack_start(*windowManagerDecidesButton, Gtk::SHRINK);
-    centralBox->pack_start(*centerOverDisplayButton, Gtk::SHRINK);
-    centralBox->pack_start(*centerOverMouseButton, Gtk::SHRINK);
-    centralBox->pack_start(*centerOverWindowButton, Gtk::SHRINK);
-    centralBox->pack_start(*centerOverWidgetButton, Gtk::SHRINK);
+    centralBox->pack_start(*windowManagerDecidesButton, Gtk::CONTRACT);
+    centralBox->pack_start(*centerOverDisplayButton, Gtk::CONTRACT);
+    centralBox->pack_start(*centerOverMouseButton, Gtk::CONTRACT);
+    centralBox->pack_start(*centerOverWindowButton, Gtk::CONTRACT);
+    centralBox->pack_start(*centerOverWidgetButton, Gtk::CONTRACT);
 
     Box* bottomBox = manage(new HBox);
     centralBox->pack_start(*bottomBox);
Only in gtkmm-1.3.18-packoptions/examples/dialog: dialog2.cc~
Only in gtkmm-1.3.18-packoptions/examples/dialog: dialog2.o
Only in gtkmm-1.3.18-packoptions/examples/dialog: dialog3
diff -ur -x Makefile gtkmm-1.3.18/examples/dialog/dialog3.cc gtkmm-1.3.18-packoptions/examples/dialog/dialog3.cc
--- gtkmm-1.3.18/examples/dialog/dialog3.cc	Mon May 20 12:22:00 2002
+++ gtkmm-1.3.18-packoptions/examples/dialog/dialog3.cc	Thu Jul 18 11:17:32 2002
@@ -45,13 +45,13 @@
     cancel_b->signal_clicked().connect(slot(*this, &MyDialog::cancel));
 
     Gtk::Box *box2 = manage(new Gtk::HBox());
-    box2->pack_start(*okay_b, Gtk::SHRINK, 10);
-    box2->pack_end(*cancel_b, Gtk::SHRINK, 10);
+    box2->pack_start(*okay_b, Gtk::CONTRACT, 10);
+    box2->pack_end(*cancel_b, Gtk::CONTRACT, 10);
 
     Gtk::Box *box = manage(new Gtk::VBox());
-    box->pack_start(*manage(new Gtk::Label(l)), Gtk::EXPAND | Gtk::FILL, 10);
-    box->pack_start(*entry, Gtk::EXPAND | Gtk::FILL ,10);
-    box->pack_start(*box2, Gtk::EXPAND | Gtk::FILL ,10);
+    box->pack_start(*manage(new Gtk::Label(l)), Gtk::EXPAND_WIDGET, 10);
+    box->pack_start(*entry, Gtk::EXPAND_WIDGET ,10);
+    box->pack_start(*box2, Gtk::EXPAND_WIDGET ,10);
     add(*box);
     set_border_width(10);
     set_size_request(200, 150);
Only in gtkmm-1.3.18-packoptions/examples/dialog: dialog3.cc~
Only in gtkmm-1.3.18-packoptions/examples/dialog: dialog3.o
Only in gtkmm-1.3.18-packoptions/examples/dnd: .libs
Only in gtkmm-1.3.18-packoptions/examples/dnd: dndwindow.o
Only in gtkmm-1.3.18-packoptions/examples/dnd: main.o
Only in gtkmm-1.3.18-packoptions/examples/dnd: testdnd
Only in gtkmm-1.3.18-packoptions/examples/entry: .libs
Only in gtkmm-1.3.18-packoptions/examples/entry: entry
Only in gtkmm-1.3.18-packoptions/examples/entry: entry.o
Only in gtkmm-1.3.18-packoptions/examples/eventbox: .libs
Only in gtkmm-1.3.18-packoptions/examples/eventbox: eventbox
Only in gtkmm-1.3.18-packoptions/examples/eventbox: eventbox.o
Only in gtkmm-1.3.18-packoptions/examples/exception: .libs
Only in gtkmm-1.3.18-packoptions/examples/exception: exceptiontest
Only in gtkmm-1.3.18-packoptions/examples/exception: exceptiontest.o
Only in gtkmm-1.3.18-packoptions/examples/filesel: .libs
Only in gtkmm-1.3.18-packoptions/examples/filesel: filesel
Only in gtkmm-1.3.18-packoptions/examples/filesel: filesel.o
Only in gtkmm-1.3.18-packoptions/examples/fixed: .libs
Only in gtkmm-1.3.18-packoptions/examples/fixed: fixed
Only in gtkmm-1.3.18-packoptions/examples/fixed: fixed.o
Only in gtkmm-1.3.18-packoptions/examples/frame: .libs
Only in gtkmm-1.3.18-packoptions/examples/frame: frame
Only in gtkmm-1.3.18-packoptions/examples/frame: frame.o
Only in gtkmm-1.3.18-packoptions/examples/gdk: .libs
Only in gtkmm-1.3.18-packoptions/examples/gdk: radar
diff -ur -x Makefile gtkmm-1.3.18/examples/gdk/radar.cc gtkmm-1.3.18-packoptions/examples/gdk/radar.cc
--- gtkmm-1.3.18/examples/gdk/radar.cc	Wed Jun 19 11:36:52 2002
+++ gtkmm-1.3.18-packoptions/examples/gdk/radar.cc	Thu Jul 18 11:19:53 2002
@@ -326,18 +326,18 @@
 
   // box2
   m_button2.signal_clicked().connect(SigC::slot(*this, &Gtk::Widget::hide));
-  m_box2.pack_start(m_box3, /*Gtk::AttachOptions*/Gtk::FILL | Gtk::EXPAND, /*pading*/5);
-  m_box2.pack_start(m_button1, Gtk::FILL, 5);
-  m_box2.pack_start(m_button2, Gtk::FILL, 5);
+  m_box2.pack_start(m_box3, /*Gtk::PackOptions*/Gtk::EXPAND_WIDGET, /*padding*/5);
+  m_box2.pack_start(m_button1, Gtk::CONTRACT, 5);
+  m_box2.pack_start(m_button2, Gtk::CONTRACT, 5);
   
   // box1
   m_area.set_size_request(400, 400);
-  m_box1.pack_start(m_area, Gtk::EXPAND | Gtk::FILL, 5);
-  m_box1.pack_start(m_box2, Gtk::FILL, 5);
+  m_box1.pack_start(m_area, Gtk::EXPAND_WIDGET, 5);
+  m_box1.pack_start(m_box2, Gtk::CONTRACT, 5);
     
   // box0
-  m_box0.pack_start(m_box1, Gtk::EXPAND | Gtk::FILL, 5);
-  m_box0.pack_start(m_sb, Gtk::FILL, 5);
+  m_box0.pack_start(m_box1, Gtk::EXPAND_WIDGET, 5);
+  m_box0.pack_start(m_sb, Gtk::CONTRACT, 5);
   
   set_border_width(10);
   add(m_box0);
Only in gtkmm-1.3.18-packoptions/examples/gdk: radar.cc~
Only in gtkmm-1.3.18-packoptions/examples/gdk: radar.o
Only in gtkmm-1.3.18-packoptions/examples/idle: .libs
Only in gtkmm-1.3.18-packoptions/examples/idle: idle
diff -ur -x Makefile gtkmm-1.3.18/examples/idle/idle.cc gtkmm-1.3.18-packoptions/examples/idle/idle.cc
--- gtkmm-1.3.18/examples/idle/idle.cc	Fri May 10 11:58:18 2002
+++ gtkmm-1.3.18-packoptions/examples/idle/idle.cc	Thu Jul 18 11:20:39 2002
@@ -53,7 +53,7 @@
   vbox->pack_start(m_progressbar_d);
 
   Gtk::HBox *hbox = manage( new Gtk::HBox(false,10));
-  hbox->pack_start(m_quit, Gtk::EXPAND);
+  hbox->pack_start(m_quit, Gtk::EXPAND_PADDING);
   vbox->pack_start(*hbox);
 
   // set border and display all
Only in gtkmm-1.3.18-packoptions/examples/idle: idle.cc~
Only in gtkmm-1.3.18-packoptions/examples/idle: idle.o
Only in gtkmm-1.3.18-packoptions/examples/label: .libs
Only in gtkmm-1.3.18-packoptions/examples/label: label
diff -ur -x Makefile gtkmm-1.3.18/examples/label/label.cc gtkmm-1.3.18-packoptions/examples/label/label.cc
--- gtkmm-1.3.18/examples/label/label.cc	Fri May 10 11:58:21 2002
+++ gtkmm-1.3.18-packoptions/examples/label/label.cc	Thu Jul 18 11:21:25 2002
@@ -25,35 +25,35 @@
   vbox = manage( new Gtk::VBox (false, 5) );
   hbox = manage( new Gtk::HBox (false, 5) );
   add (*hbox);
-  hbox->pack_start (*vbox, Gtk::SHRINK);
+  hbox->pack_start (*vbox, Gtk::CONTRACT);
 
   frame = manage( new Gtk::Frame ("Normal Label") );
   label = manage( new Gtk::Label ("_This is a Normal label", true) );
   frame->add (*label);
-  vbox->pack_start (*frame, Gtk::SHRINK);
+  vbox->pack_start (*frame, Gtk::CONTRACT);
   
   frame = manage( new Gtk::Frame ("Multi-line Label") );
   label = manage( new Gtk::Label ("This is a Multi-line label.\nSecond line\n" \
 			 "Third line"));
   frame->add (*label);
-  vbox->pack_start (*frame, Gtk::SHRINK);
+  vbox->pack_start (*frame, Gtk::CONTRACT);
 
   frame = manage( new Gtk::Frame ("Left Justified Label") );
   label = manage( new Gtk::Label ("This is a Left-Justified\n" \
 			 "Multi-line label.\nThird      line"));
   label->set_justify (Gtk::JUSTIFY_LEFT);
   frame->add (*label);
-  vbox->pack_start (*frame, Gtk::SHRINK);
+  vbox->pack_start (*frame, Gtk::CONTRACT);
   
   frame = manage( new Gtk::Frame ("Right Justified Label"));
   label = manage( new Gtk::Label ("This is a Right-Justified\nMulti-line label.\n" \
 			 "Fourth line, (j/k)"));
   label->set_justify (Gtk::JUSTIFY_RIGHT);
   frame->add (*label);
-  vbox->pack_start (*frame, Gtk::SHRINK);
+  vbox->pack_start (*frame, Gtk::CONTRACT);
 
   vbox = manage( new Gtk::VBox (false, 5) );
-  hbox->pack_start (*vbox, Gtk::SHRINK);
+  hbox->pack_start (*vbox, Gtk::CONTRACT);
 
   frame = manage( new Gtk::Frame ("Line wrapped label"));
   label = manage( new Gtk::Label ("This is an example of a line-wrapped label.  It " \
@@ -68,7 +68,7 @@
 			 "many          extra  spaces. "));
   label->set_line_wrap (true);
   frame->add (*label);
-  vbox->pack_start (*frame, Gtk::SHRINK);
+  vbox->pack_start (*frame, Gtk::CONTRACT);
   
   frame = manage( new Gtk::Frame("Filled, wrapped label") );
   label = manage( new Gtk::Label("This is an example of a line-wrapped, filled label.  " \
@@ -84,7 +84,7 @@
   label->set_justify (Gtk::JUSTIFY_FILL);
   label->set_line_wrap (true);
   frame->add (*label);
-  vbox->pack_start (*frame, Gtk::SHRINK);
+  vbox->pack_start (*frame, Gtk::CONTRACT);
   
   frame = manage( new Gtk::Frame("Underlined label") );
   label = manage( new Gtk::Label("This label is underlined!\n"
@@ -92,7 +92,7 @@
   label->set_justify (Gtk::JUSTIFY_LEFT);
   label->set_pattern ("_________________________ _ _________ _ ______     __ _______ ___");
   frame->add (*label);
-  vbox->pack_start (*frame, Gtk::SHRINK);
+  vbox->pack_start (*frame, Gtk::CONTRACT);
   
   show_all ();
 }
Only in gtkmm-1.3.18-packoptions/examples/label: label.cc~
Only in gtkmm-1.3.18-packoptions/examples/label: label.o
diff -ur -x Makefile gtkmm-1.3.18/examples/menu/menu.cc gtkmm-1.3.18-packoptions/examples/menu/menu.cc
--- gtkmm-1.3.18/examples/menu/menu.cc	Mon May 20 12:22:08 2002
+++ gtkmm-1.3.18-packoptions/examples/menu/menu.cc	Thu Jul 18 11:22:17 2002
@@ -65,13 +65,13 @@
 
     /* Create a menu-bar to hold the menus and add it to our main window */
     MenuBar* menu_bar = manage( new MenuBar() );
-    vbox->pack_start(*menu_bar, Gtk::SHRINK, 2);
+    vbox->pack_start(*menu_bar, Gtk::CONTRACT, 2);
 
     /* Create a button to which to attach menu as a popup */
 //    Button* button = manage( new Button("press me") );
 //    button->signal_event().connect( slot(*menu,&MyMenu::button_press) );
 //
-//    vbox->pack_end(*button, Gtk::EXPAND | Gtk::FILL, 2);
+//    vbox->pack_end(*button, Gtk::EXPAND_WIDGET, 2);
 
     /* And finally we append the menu-item to the menu-bar -- this is the
      * "root" menu-item I have been raving about =) */
Only in gtkmm-1.3.18-packoptions/examples/menu: menu.cc~
diff -ur -x Makefile gtkmm-1.3.18/examples/menu/menu2.cc gtkmm-1.3.18-packoptions/examples/menu/menu2.cc
--- gtkmm-1.3.18/examples/menu/menu2.cc	Mon Jul  1 08:28:30 2002
+++ gtkmm-1.3.18-packoptions/examples/menu/menu2.cc	Thu Jul 18 11:28:38 2002
@@ -163,7 +163,7 @@
    // vbox
    VBox *vbox = manage( new VBox() );
    add(*vbox);
-   vbox->pack_start (*menubar, Gtk::SHRINK);
+   vbox->pack_start (*menubar, Gtk::CONTRACT);
 
    // eventbox
    EventBox *ebox = manage( new EventBox() );
Only in gtkmm-1.3.18-packoptions/examples/menu: menu2.cc~
diff -ur -x Makefile gtkmm-1.3.18/examples/menu/stock.cc gtkmm-1.3.18-packoptions/examples/menu/stock.cc
--- gtkmm-1.3.18/examples/menu/stock.cc	Mon May 20 12:22:08 2002
+++ gtkmm-1.3.18-packoptions/examples/menu/stock.cc	Thu Jul 18 11:29:20 2002
@@ -62,7 +62,7 @@
 
     /* Create a menu-bar to hold the menus and add it to our main window */
     MenuBar* menu_bar = manage( new MenuBar() );
-    vbox->pack_start(*menu_bar, Gtk::SHRINK);
+    vbox->pack_start(*menu_bar, Gtk::CONTRACT);
 
     /* Create a button to which to attach menu as a popup */
     Button* button = manage( new Button("press me") );
@@ -70,7 +70,7 @@
 
 //    gtk_signal_connect_object(GTK_OBJECT(button), "event",
 //	GTK_SIGNAL_FUNC (button_press), GTK_OBJECT(menu));
-    vbox->pack_end(*button, Gtk::EXPAND | Gtk::FILL, 2);
+    vbox->pack_end(*button, Gtk::EXPAND_WIDGET, 2);
 
     /* And finally we append the menu-item to the menu-bar -- this is the
      * "root" menu-item I have been raving about =) */
Only in gtkmm-1.3.18-packoptions/examples/menu: stock.cc~
Only in gtkmm-1.3.18-packoptions/examples/notebook: .libs
Only in gtkmm-1.3.18-packoptions/examples/notebook: notebook
Only in gtkmm-1.3.18-packoptions/examples/notebook: notebook.o
Only in gtkmm-1.3.18-packoptions/examples/packbox: .libs
Only in gtkmm-1.3.18-packoptions/examples/packbox: packbox
diff -ur -x Makefile gtkmm-1.3.18/examples/packbox/packbox.cc gtkmm-1.3.18-packoptions/examples/packbox/packbox.cc
--- gtkmm-1.3.18/examples/packbox/packbox.cc	Fri May 10 11:58:26 2002
+++ gtkmm-1.3.18-packoptions/examples/packbox/packbox.cc	Thu Jul 18 11:43:40 2002
@@ -16,7 +16,7 @@
 class PackBox : public Gtk::HBox
 {
 public:
-  PackBox(bool homogeneous, int spacing, Gtk::AttachOptions, int padding = 0);
+  PackBox(bool homogeneous, int spacing, Gtk::PackOptions, int padding = 0);
   virtual ~PackBox() { delete m_button6; }
 
   Gtk::Button m_button1, m_button2, m_button3, m_button4, m_button5,
@@ -24,13 +24,13 @@
   char padstr[80];
 };
 
-PackBox::PackBox(bool homogeneous, int spacing, Gtk::AttachOptions options, int padding) :
+PackBox::PackBox(bool homogeneous, int spacing, Gtk::PackOptions options, int padding) :
   Gtk::HBox(homogeneous, spacing),
   m_button1("gtk_box_pack"),
   m_button2("(box,"),
   m_button3("button,"),
-  m_button4( ((options & Gtk::EXPAND) == Gtk::EXPAND) ? "true," : "false,"),
-  m_button5( ((options & Gtk::FILL) == Gtk::FILL) ? "true," : "false,")
+  m_button4( ((options == Gtk::EXPAND_PADDING) || (options == Gtk::EXPAND_WIDGET)) ? "true," : "false,"),
+  m_button5( (options == Gtk::EXPAND_WIDGET) ? "true," : "false,")
 {
   pack_start(m_button1, options, padding);
   pack_start(m_button2, options, padding);
@@ -81,42 +81,42 @@
     // Pack the label into the vertical box (vbox box1).  Remember that 
     // widgets added to a vbox will be packed one on top of the other in
     // order. 
-    m_box1.pack_start(*m_label1, Gtk::SHRINK);
+    m_box1.pack_start(*m_label1, Gtk::CONTRACT);
 
     // Create a PackBox - homogeneous = false, spacing = 0,
     // expand = false, fill = false, padding = 0 
-    m_packbox1 = manage(new PackBox(false, 0, Gtk::SHRINK));
-    m_box1.pack_start(*m_packbox1, Gtk::SHRINK);
+    m_packbox1 = manage(new PackBox(false, 0, Gtk::CONTRACT));
+    m_box1.pack_start(*m_packbox1, Gtk::CONTRACT);
 
     // Create a PackBox - homogeneous = false, spacing = 0,
     // expand = true, fill = false, padding = 0 
-    m_packbox2 = manage(new PackBox(false, 0, Gtk::FILL));
-    m_box1.pack_start(*m_packbox2, Gtk::SHRINK);
+    m_packbox2 = manage(new PackBox(false, 0, Gtk::CONTRACT));
+    m_box1.pack_start(*m_packbox2, Gtk::CONTRACT);
 
     // Create a PackBox - homogeneous = false, spacing = 0,
     // expand = true, fill = true, padding = 0 
-    m_packbox3 = manage(new PackBox(false, 0, Gtk::EXPAND | Gtk::FILL));
-    m_box1.pack_start(*m_packbox3, Gtk::SHRINK);
+    m_packbox3 = manage(new PackBox(false, 0, Gtk::EXPAND_WIDGET));
+    m_box1.pack_start(*m_packbox3, Gtk::CONTRACT);
     
     // pack the separator into the vbox.  Remember each of these
     // widgets are being packed into a vbox, so they'll be stacked
     // vertically. 
-    m_box1.pack_start(m_seperator1, Gtk::FILL, 5);
+    m_box1.pack_start(m_seperator1, Gtk::CONTRACT, 5);
     
     // create another new label, and show it.
     m_label2 = manage(new Gtk::Label("hbox(true, 0);"));
     m_label2->set_alignment(0, 0);
-    m_box1.pack_start(*m_label2, Gtk::SHRINK);
+    m_box1.pack_start(*m_label2, Gtk::CONTRACT);
     
     // Args are: homogeneous, spacing, expand, fill, padding
-    m_packbox4 = manage(new PackBox(true, 0, Gtk::EXPAND));
-    m_box1.pack_start(*m_packbox4, Gtk::SHRINK);
+    m_packbox4 = manage(new PackBox(true, 0, Gtk::EXPAND_PADDING));
+    m_box1.pack_start(*m_packbox4, Gtk::CONTRACT);
 
     // Args are: homogeneous, spacing, expand, fill, padding
-    m_packbox5 = manage(new PackBox(true, 0, Gtk::EXPAND));
-    m_box1.pack_start(*m_packbox5, Gtk::SHRINK);
+    m_packbox5 = manage(new PackBox(true, 0, Gtk::EXPAND_PADDING));
+    m_box1.pack_start(*m_packbox5, Gtk::CONTRACT);
 
-    m_box1.pack_start(m_seperator2, Gtk::FILL, 5);
+    m_box1.pack_start(m_seperator2, Gtk::CONTRACT, 5);
     
     break;
     
@@ -124,28 +124,28 @@
 
     m_label1 = manage(new Gtk::Label("hbox(false, 10);"));
     m_label1->set_alignment(0, 0);
-    m_box1.pack_start(*m_label1, Gtk::SHRINK);
+    m_box1.pack_start(*m_label1, Gtk::CONTRACT);
 
-    m_packbox1 = manage(new PackBox(false, 10, Gtk::EXPAND));
-    m_box1.pack_start(*m_packbox1, Gtk::SHRINK);
+    m_packbox1 = manage(new PackBox(false, 10, Gtk::EXPAND_PADDING));
+    m_box1.pack_start(*m_packbox1, Gtk::CONTRACT);
     
-    m_packbox2 = manage(new PackBox(false, 10, Gtk::EXPAND | Gtk::FILL));
-    m_box1.pack_start(*m_packbox2, Gtk::SHRINK);
+    m_packbox2 = manage(new PackBox(false, 10, Gtk::EXPAND_WIDGET));
+    m_box1.pack_start(*m_packbox2, Gtk::CONTRACT);
 
-    m_box1.pack_start(m_seperator1, Gtk::FILL, 5);
+    m_box1.pack_start(m_seperator1, Gtk::CONTRACT, 5);
 
 
     m_label2 = manage(new Gtk::Label("hbox(false, 10);"));
     m_label2->set_alignment(0, 0);
-    m_box1.pack_start(*m_label2, Gtk::SHRINK);
+    m_box1.pack_start(*m_label2, Gtk::CONTRACT);
 
-    m_packbox3 = manage(new PackBox(false, 0, Gtk::FILL, 10));
-    m_box1.pack_start(*m_packbox3, Gtk::SHRINK);
+    m_packbox3 = manage(new PackBox(false, 0, Gtk::CONTRACT, 10));
+    m_box1.pack_start(*m_packbox3, Gtk::CONTRACT);
     
-    m_packbox4 = manage(new PackBox(false, 0, Gtk::EXPAND | Gtk::FILL, 10));
-    m_box1.pack_start(*m_packbox4, Gtk::SHRINK);
+    m_packbox4 = manage(new PackBox(false, 0, Gtk::EXPAND_WIDGET, 10));
+    m_box1.pack_start(*m_packbox4, Gtk::CONTRACT);
 
-    m_box1.pack_start(m_seperator2, Gtk::FILL, 5);
+    m_box1.pack_start(m_seperator2, Gtk::CONTRACT, 5);
 
     break;
     
@@ -153,14 +153,14 @@
 
     // This demonstrates the ability to use Gtk::Box::pack_end() to
     // right justify widgets.  First, we create a new box as before. 
-    m_packbox1 = manage(new PackBox(false, 0, Gtk::SHRINK));
+    m_packbox1 = manage(new PackBox(false, 0, Gtk::CONTRACT));
     // create the label that will be put at the end. 
     m_label1 = manage(new Gtk::Label("end"));
     // pack it using pack_end(), so it is put on the right side
     // of the PackBox. 
-    m_packbox1->pack_end(*m_label1, Gtk::SHRINK);
+    m_packbox1->pack_end(*m_label1, Gtk::CONTRACT);
     
-    m_box1.pack_start(*m_packbox1, Gtk::SHRINK);
+    m_box1.pack_start(*m_packbox1, Gtk::CONTRACT);
     
     // this explicitly sets the separator to 400 pixels wide by 5 pixels
     // high.  This is so the hbox we created will also be 400 pixels wide,
@@ -170,7 +170,7 @@
     m_seperator1.set_size_request(400, 5);
     
     // pack the separator into ourselves 
-    m_box1.pack_start(m_seperator1, Gtk::FILL, 5);
+    m_box1.pack_start(m_seperator1, Gtk::CONTRACT, 5);
   }
   
   // setup the signal to destroy the window.  Remember that this will send
@@ -180,8 +180,8 @@
 
   // pack the button into the quitbox.
   // The last 3 arguments to gtk_box_pack_start are: expand, fill, padding. 
-  m_boxQuit.pack_start(m_buttonQuit, Gtk::EXPAND);
-  m_box1.pack_start(m_boxQuit, Gtk::SHRINK);
+  m_boxQuit.pack_start(m_buttonQuit, Gtk::EXPAND_PADDING);
+  m_box1.pack_start(m_boxQuit, Gtk::CONTRACT);
   
   // pack the vbox (box1) which now contains all our widgets, into the
   // main window. 
Only in gtkmm-1.3.18-packoptions/examples/packbox: packbox.cc~
Only in gtkmm-1.3.18-packoptions/examples/packbox: packbox.o
Only in gtkmm-1.3.18-packoptions/examples/paned: .libs
Only in gtkmm-1.3.18-packoptions/examples/paned: paned
Only in gtkmm-1.3.18-packoptions/examples/paned: paned.o
Only in gtkmm-1.3.18-packoptions/examples/progressbar: .libs
Only in gtkmm-1.3.18-packoptions/examples/progressbar: progressbar
Only in gtkmm-1.3.18-packoptions/examples/progressbar: progressbar.o
Only in gtkmm-1.3.18-packoptions/examples/rangewidgets: .libs
Only in gtkmm-1.3.18-packoptions/examples/rangewidgets: rangewidgets
diff -ur -x Makefile gtkmm-1.3.18/examples/rangewidgets/rangewidgets.cc gtkmm-1.3.18-packoptions/examples/rangewidgets/rangewidgets.cc
--- gtkmm-1.3.18/examples/rangewidgets/rangewidgets.cc	Fri Jun 14 03:58:30 2002
+++ gtkmm-1.3.18-packoptions/examples/rangewidgets/rangewidgets.cc	Thu Jul 18 11:45:03 2002
@@ -31,7 +31,7 @@
     m_label(menutitle),
     m_menu(menu)
 {
-  pack_start(m_label, Gtk::SHRINK);
+  pack_start(m_label, Gtk::CONTRACT);
   Gtk::OptionMenu *om=manage(new Gtk::OptionMenu);
   om->set_menu(*m_menu);
   pack_start(*om);
@@ -160,7 +160,7 @@
   }
 
   Gtk::HBox *lsbox1 = manage(new Gtk::HBox(false,10));
-  lsbox1->pack_start(*manage(new Gtk::Label("Scale Digits:",0)),  Gtk::SHRINK);
+  lsbox1->pack_start(*manage(new Gtk::Label("Scale Digits:",0)),  Gtk::CONTRACT);
   Gtk::Adjustment *adj1 = manage(new Gtk::Adjustment(1.0, 0.0, 5.0));
   Gtk::HScale *digits = manage(new Gtk::HScale(*adj1));
   digits->set_digits(0);
@@ -168,7 +168,7 @@
   lsbox1->pack_start(*digits);
 
   Gtk::HBox *lsbox2 = manage(new Gtk::HBox(false,10));
-  lsbox2->pack_start(*manage(new Gtk::Label("Scrollbar Page Size:",0)), Gtk::SHRINK);
+  lsbox2->pack_start(*manage(new Gtk::Label("Scrollbar Page Size:",0)), Gtk::CONTRACT);
   Gtk::Adjustment *adj2 = manage(new Gtk::Adjustment(1.0, 1.0, 101.0));
   Gtk::HScale *pgsize = manage(new Gtk::HScale(*adj2));
   pgsize->set_digits(0);
@@ -177,8 +177,8 @@
   
   m_vbox2.pack_start(*lsbox1);
   m_vbox2.pack_start(*lsbox2);
-  m_vbox1.pack_start(m_separator, Gtk::FILL);
-  m_vbox1.pack_start(m_buttonQuit, Gtk::SHRINK);
+  m_vbox1.pack_start(m_separator, Gtk::CONTRACT);
+  m_vbox1.pack_start(m_buttonQuit, Gtk::CONTRACT);
   m_buttonQuit.set_flags(Gtk::CAN_DEFAULT);
   m_buttonQuit.grab_default();
   m_buttonQuit.signal_clicked().connect(SigC::slot(&Gtk::Main::quit));
Only in gtkmm-1.3.18-packoptions/examples/rangewidgets: rangewidgets.cc~
Only in gtkmm-1.3.18-packoptions/examples/rangewidgets: rangewidgets.o
Only in gtkmm-1.3.18-packoptions/examples/rulers: .libs
Only in gtkmm-1.3.18-packoptions/examples/rulers: rulers
Only in gtkmm-1.3.18-packoptions/examples/rulers: rulers.o
Only in gtkmm-1.3.18-packoptions/examples/scrolledwin: .libs
Only in gtkmm-1.3.18-packoptions/examples/scrolledwin: scrolledwin
Only in gtkmm-1.3.18-packoptions/examples/scrolledwin: scrolledwin.o
Only in gtkmm-1.3.18-packoptions/examples/spinbutton: .libs
Only in gtkmm-1.3.18-packoptions/examples/spinbutton: spinbutton
diff -ur -x Makefile gtkmm-1.3.18/examples/spinbutton/spinbutton.cc gtkmm-1.3.18-packoptions/examples/spinbutton/spinbutton.cc
--- gtkmm-1.3.18/examples/spinbutton/spinbutton.cc	Fri May 10 11:58:32 2002
+++ gtkmm-1.3.18-packoptions/examples/spinbutton/spinbutton.cc	Thu Jul 18 11:47:01 2002
@@ -100,47 +100,47 @@
   /* Day, month, year spinners */
   
   hbox = Gtk::manage( new Gtk::HBox (false, 0) );
-  vbox->pack_start (*hbox, Gtk::EXPAND | Gtk::FILL, 5);
+  vbox->pack_start (*hbox, Gtk::EXPAND_WIDGET, 5);
   
   vbox2 = Gtk::manage( new Gtk::VBox (false, 0) );
-  hbox->pack_start (*vbox2, Gtk::EXPAND | Gtk::FILL, 5);
+  hbox->pack_start (*vbox2, Gtk::EXPAND_WIDGET, 5);
   
   label = Gtk::manage( new Gtk::Label ("Day :"));
   label->set_alignment(0, 0.5);
-  vbox2->pack_start (*label, Gtk::FILL);
+  vbox2->pack_start (*label, Gtk::CONTRACT);
   
   adj = Gtk::manage( new Gtk::Adjustment (1.0, 1.0, 31.0, 1.0, 5.0, 0.0) );
   spinner = Gtk::manage( new Gtk::SpinButton (*adj, 0, 0) );
   spinner->set_wrap (true);
   //spinner->set_shadow_type (Gtk::SHADOW_OUT);
-  vbox2->pack_start (*spinner, Gtk::FILL);
+  vbox2->pack_start (*spinner, Gtk::CONTRACT);
   
   vbox2 = Gtk::manage( new Gtk::VBox (false, 0) );
-  hbox->pack_start (*vbox2, Gtk::EXPAND | Gtk::FILL, 5);
+  hbox->pack_start (*vbox2, Gtk::EXPAND_WIDGET, 5);
   
   label = Gtk::manage( new Gtk::Label ("Month :"));
   label->set_alignment(0, 0.5);
-  vbox2->pack_start (*label, Gtk::FILL);
+  vbox2->pack_start (*label, Gtk::CONTRACT);
   
   adj = Gtk::manage( new Gtk::Adjustment (1.0, 1.0, 12.0, 1.0, 5.0, 0.0) );
   spinner = Gtk::manage( new Gtk::SpinButton (*adj, 0, 0) );
   spinner->set_wrap (true);
   //spinner->set_shadow_type (Gtk::SHADOW_ETCHED_IN);
-  vbox2->pack_start (*spinner, Gtk::FILL);
+  vbox2->pack_start (*spinner, Gtk::CONTRACT);
   
   vbox2 = Gtk::manage( new Gtk::VBox (false, 0) );
-  hbox->pack_start (*vbox2, Gtk::EXPAND | Gtk::FILL, 5);
+  hbox->pack_start (*vbox2, Gtk::EXPAND_WIDGET, 5);
   
   label = Gtk::manage( new Gtk::Label ("Year :"));
   label->set_alignment(0, 0.5);
-  vbox2->pack_start (*label, Gtk::FILL);
+  vbox2->pack_start (*label, Gtk::CONTRACT);
   
   adj = Gtk::manage( new Gtk::Adjustment (1998.0, 0.0, 2100.0, 1.0, 100.0, 0.0) );
   spinner = Gtk::manage( new Gtk::SpinButton (*adj, 0, 0) );
   spinner->set_wrap (false);
   //spinner->set_shadow_type (Gtk::SHADOW_IN);
   spinner->set_size_request (55, 0);
-  vbox2->pack_start (*spinner, Gtk::FILL);
+  vbox2->pack_start (*spinner, Gtk::CONTRACT);
   
   frame = Gtk::manage( new Gtk::Frame ("Accelerated") );
   main_vbox->pack_start (*frame);
@@ -150,28 +150,28 @@
   frame->add (*vbox);
   
   hbox = Gtk::manage( new Gtk::HBox (false, 0) );
-  vbox->pack_start (*hbox, Gtk::FILL, 5);
+  vbox->pack_start (*hbox, Gtk::CONTRACT, 5);
   
   vbox2 = Gtk::manage( new Gtk::VBox (false, 0) );
-  hbox->pack_start (*vbox2, Gtk::EXPAND | Gtk::FILL, 5);
+  hbox->pack_start (*vbox2, Gtk::EXPAND_WIDGET, 5);
   
   label = Gtk::manage( new Gtk::Label ("Value :"));
   label->set_alignment(0, 0.5);
-  vbox2->pack_start (*label, Gtk::FILL);
+  vbox2->pack_start (*label, Gtk::CONTRACT);
   
   adj = Gtk::manage( new Gtk::Adjustment (0.0, -10000.0, 10000.0,
 					      0.5, 100.0, 0.0) );
   spinner1 = Gtk::manage( new Gtk::SpinButton (*adj, 1.0, 2) );
   spinner1->set_wrap (true);
   spinner1->set_size_request (100, 0);
-  vbox2->pack_start (*spinner1, Gtk::FILL);
+  vbox2->pack_start (*spinner1, Gtk::CONTRACT);
   
   vbox2 = Gtk::manage( new Gtk::VBox (false, 0) );
-  hbox->pack_start (*vbox2, Gtk::EXPAND | Gtk::FILL, 5);
+  hbox->pack_start (*vbox2, Gtk::EXPAND_WIDGET, 5);
   
   label = Gtk::manage( new Gtk::Label ("Digits :"));
   label->set_alignment(0, 0.5);
-  vbox2->pack_start (*label, Gtk::FILL);
+  vbox2->pack_start (*label, Gtk::CONTRACT);
   
   adj = Gtk::manage( new Gtk::Adjustment (2, 1, 5, 1, 1, 0) );
 
@@ -179,10 +179,10 @@
   spinner2->set_wrap (true);
   adj->signal_value_changed().connect(
     bind(slot(*this, &AppWindow::change_digits),spinner2));
-  vbox2->pack_start (*spinner2, Gtk::FILL);
+  vbox2->pack_start (*spinner2, Gtk::CONTRACT);
   
   hbox = Gtk::manage( new Gtk::HBox (false, 0) );
-  vbox->pack_start (*hbox, Gtk::FILL, 5);
+  vbox->pack_start (*hbox, Gtk::CONTRACT, 5);
   
   checkbutton = Gtk::manage( new ToggleSnap (spinner, "Snap to 0.5-ticks"));
   vbox->pack_start (*checkbutton);
@@ -195,25 +195,25 @@
   val_label = Gtk::manage( new Gtk::Label ("") );
   
   hbox = Gtk::manage( new Gtk::HBox (false, 0) );
-  vbox->pack_start (*hbox, Gtk::FILL, 5);
+  vbox->pack_start (*hbox, Gtk::CONTRACT, 5);
 
   button = Gtk::manage( new Gtk::Button ("Value as Int") );
   button->signal_clicked().connect(bind(slot(*this,&AppWindow::get_value),1));
-  hbox->pack_start (*button, Gtk::EXPAND | Gtk::FILL, 5);
+  hbox->pack_start (*button, Gtk::EXPAND_WIDGET, 5);
   
   button = Gtk::manage( new Gtk::Button ("Value as Float") );
   button->signal_clicked().connect(bind(slot(*this,&AppWindow::get_value),2));
-  hbox->pack_start (*button, Gtk::EXPAND | Gtk::FILL, 5);
+  hbox->pack_start (*button, Gtk::EXPAND_WIDGET, 5);
   
   vbox->pack_start (*val_label);
   val_label->set_text ("0");
   
   hbox = Gtk::manage( new Gtk::HBox (false, 0));
-  main_vbox->pack_start (*hbox, Gtk::FILL);
+  main_vbox->pack_start (*hbox, Gtk::CONTRACT);
   
   button = Gtk::manage( new Gtk::Button ("Close") );
   button->signal_clicked().connect(&Gtk::Main::quit);
-  hbox->pack_start (*button, Gtk::EXPAND | Gtk::FILL, 5);
+  hbox->pack_start (*button, Gtk::EXPAND_WIDGET, 5);
 
   show_all ();
 }
Only in gtkmm-1.3.18-packoptions/examples/spinbutton: spinbutton.cc~
Only in gtkmm-1.3.18-packoptions/examples/spinbutton: spinbutton.o
Only in gtkmm-1.3.18-packoptions/examples/statusbar: .libs
Only in gtkmm-1.3.18-packoptions/examples/statusbar: statusbar
Only in gtkmm-1.3.18-packoptions/examples/statusbar: statusbar.o
Only in gtkmm-1.3.18-packoptions/examples/stock: .libs
Only in gtkmm-1.3.18-packoptions/examples/stock: stock
diff -ur -x Makefile gtkmm-1.3.18/examples/stock/stock.cc gtkmm-1.3.18-packoptions/examples/stock/stock.cc
--- gtkmm-1.3.18/examples/stock/stock.cc	Sat Jun 22 08:26:21 2002
+++ gtkmm-1.3.18-packoptions/examples/stock/stock.cc	Thu Jul 18 11:47:44 2002
@@ -50,10 +50,10 @@
     add(*vbox);
 
     Gtk::Toolbar* toolbar = manage (new Gtk::Toolbar ());
-    vbox->pack_start (*toolbar, Gtk::SHRINK);
+    vbox->pack_start (*toolbar, Gtk::CONTRACT);
 
     Gtk::OptionMenu* optionmenu = manage (new Gtk::OptionMenu ());
-    vbox->pack_start (*optionmenu, Gtk::SHRINK);
+    vbox->pack_start (*optionmenu, Gtk::CONTRACT);
 
     Gtk::Button* button = manage (new Gtk::Button ("Quit"));
     button->signal_clicked ()
Only in gtkmm-1.3.18-packoptions/examples/stock: stock.cc~
Only in gtkmm-1.3.18-packoptions/examples/stock: stock.o
Only in gtkmm-1.3.18-packoptions/examples/table: .libs
Only in gtkmm-1.3.18-packoptions/examples/table: table
Only in gtkmm-1.3.18-packoptions/examples/table: table.o
Only in gtkmm-1.3.18-packoptions/examples/thread: .libs
Only in gtkmm-1.3.18-packoptions/examples/thread: dispatcher
diff -ur -x Makefile gtkmm-1.3.18/examples/thread/dispatcher.cc gtkmm-1.3.18-packoptions/examples/thread/dispatcher.cc
--- gtkmm-1.3.18/examples/thread/dispatcher.cc	Fri Jun 14 15:39:44 2002
+++ gtkmm-1.3.18-packoptions/examples/thread/dispatcher.cc	Thu Jul 18 11:48:30 2002
@@ -122,7 +122,7 @@
   for(int i = 0; i < 5; ++i)
   {
     ThreadProgress *const progress = new ThreadProgress();
-    vbox->pack_start(*Gtk::manage(progress), Gtk::SHRINK);
+    vbox->pack_start(*Gtk::manage(progress), Gtk::CONTRACT);
     progress_bars_.push_back(progress);
 
     progress->signal_finished().connect(
@@ -130,10 +130,10 @@
   }
 
   Gtk::ButtonBox *const button_box = new Gtk::HButtonBox();
-  vbox->pack_end(*Gtk::manage(button_box), Gtk::SHRINK);
+  vbox->pack_end(*Gtk::manage(button_box), Gtk::CONTRACT);
 
   close_button_ = new Gtk::Button(Gtk::Stock::CLOSE);
-  button_box->pack_start(*Gtk::manage(close_button_), Gtk::SHRINK);
+  button_box->pack_start(*Gtk::manage(close_button_), Gtk::CONTRACT);
   close_button_->set_flags(Gtk::CAN_DEFAULT);
   close_button_->grab_default();
   close_button_->set_sensitive(false);
Only in gtkmm-1.3.18-packoptions/examples/thread: dispatcher.cc~
Only in gtkmm-1.3.18-packoptions/examples/thread: dispatcher.o
Only in gtkmm-1.3.18-packoptions/examples/thread: thread
Only in gtkmm-1.3.18-packoptions/examples/thread: thread.o
Only in gtkmm-1.3.18-packoptions/examples/thread: threadpool
Only in gtkmm-1.3.18-packoptions/examples/thread: threadpool.o
Only in gtkmm-1.3.18-packoptions/examples/tictactoe: .libs
Only in gtkmm-1.3.18-packoptions/examples/tictactoe: tictactoe.o
Only in gtkmm-1.3.18-packoptions/examples/tictactoe: ttt_test
Only in gtkmm-1.3.18-packoptions/examples/tictactoe: ttt_test.o
Only in gtkmm-1.3.18-packoptions/examples/toolbar: .libs
Only in gtkmm-1.3.18-packoptions/examples/toolbar: toolbar
diff -ur -x Makefile gtkmm-1.3.18/examples/toolbar/toolbar.cc gtkmm-1.3.18-packoptions/examples/toolbar/toolbar.cc
--- gtkmm-1.3.18/examples/toolbar/toolbar.cc	Fri May 10 11:58:39 2002
+++ gtkmm-1.3.18-packoptions/examples/toolbar/toolbar.cc	Thu Jul 18 11:49:30 2002
@@ -45,8 +45,8 @@
 
   main_hbox.add(hbox);
   
-  hbox.pack_start(button, Gtk::SHRINK);
-  hbox.pack_start(toolbar, Gtk::SHRINK);
+  hbox.pack_start(button, Gtk::CONTRACT);
+  hbox.pack_start(toolbar, Gtk::CONTRACT);
 
   button.signal_clicked().connect(
       slot(*this, &MainWindowClass::quit_pressed_cb));
Only in gtkmm-1.3.18-packoptions/examples/toolbar: toolbar.cc~
Only in gtkmm-1.3.18-packoptions/examples/toolbar: toolbar.o
Only in gtkmm-1.3.18-packoptions/examples/window: .libs
Only in gtkmm-1.3.18-packoptions/examples/window: wheelbarrow
Only in gtkmm-1.3.18-packoptions/examples/window: wheelbarrow.o
Only in gtkmm-1.3.18-packoptions/gtk/src: .stamps
diff -ur -x Makefile gtkmm-1.3.18/gtk/src/bin.ccg gtkmm-1.3.18-packoptions/gtk/src/bin.ccg
--- gtkmm-1.3.18/gtk/src/bin.ccg	Fri May 10 11:58:41 2002
+++ gtkmm-1.3.18-packoptions/gtk/src/bin.ccg	Thu Jul 18 10:33:48 2002
@@ -75,7 +75,7 @@
 
   //Put them in a VBox:
   Box* box = manage(new HBox(false,5));
-  box->pack_start(*pmap, FILL);
+  box->pack_start(*pmap, CONTRACT);
   box->pack_start(*label);
   box->show_all();
 
@@ -95,7 +95,7 @@
 
   //Put them in a VBox:
   Box* vbox = manage(new HBox(false, 5));
-  vbox->pack_start(*pmap, FILL);
+  vbox->pack_start(*pmap, CONTRACT);
   vbox->pack_start(*label);
   vbox->show_all();
 
Only in gtkmm-1.3.18-packoptions/gtk/src: bin.ccg~
diff -ur -x Makefile gtkmm-1.3.18/gtk/src/box.ccg gtkmm-1.3.18-packoptions/gtk/src/box.ccg
--- gtkmm-1.3.18/gtk/src/box.ccg	Wed Jun 26 01:12:35 2002
+++ gtkmm-1.3.18-packoptions/gtk/src/box.ccg	Thu Jul 18 10:36:25 2002
@@ -45,8 +45,8 @@
 box_iterator BoxList::insert(box_iterator position, const Element& e)
 {
   iterator i;
-  bool expand = ((e.options_ & EXPAND) == EXPAND);
-  bool fill = ((e.options_ & FILL) == FILL);
+  bool expand = (e.options_ == EXPAND_PADDING) || (e.options_ == EXPAND_WIDGET);
+  bool fill = (e.options_ == EXPAND_WIDGET);
 
   if (e.pack_ == PACK_START)
     gtk_box_pack_start(gparent(), (e.widget_?e.widget_->gobj():0),
@@ -84,18 +84,18 @@
   return children_proxy_;
 }
 
-void Box::pack_start(Widget& child, AttachOptions options, guint padding)
+void Box::pack_start(Widget& child, PackOptions options, guint padding)
 {
-  bool expand = ((options & EXPAND) == EXPAND);
-  bool fill = ((options & FILL) == FILL);
+  bool expand = (options == EXPAND_PADDING) || (options == EXPAND_WIDGET);
+  bool fill = (options == EXPAND_WIDGET);
 
   gtk_box_pack_start(gobj(), child.gobj(), (gboolean)expand, (gboolean)fill, padding);
 }
 
-void Box::pack_end(Widget& child, AttachOptions options, guint padding)
+void Box::pack_end(Widget& child, PackOptions options, guint padding)
 {
-  bool expand = ((options & EXPAND) == EXPAND);
-  bool fill = ((options & FILL) == FILL);
+  bool expand = (options == EXPAND_PADDING) || (options == EXPAND_WIDGET);
+  bool fill = (options == EXPAND_WIDGET);
 
   gtk_box_pack_end(gobj(), child.gobj(), (gboolean)expand, (gboolean)fill, padding);
 }
Only in gtkmm-1.3.18-packoptions/gtk/src: box.ccg~
diff -ur -x Makefile gtkmm-1.3.18/gtk/src/box.hg gtkmm-1.3.18-packoptions/gtk/src/box.hg
--- gtkmm-1.3.18/gtk/src/box.hg	Sat Jul 13 12:57:00 2002
+++ gtkmm-1.3.18-packoptions/gtk/src/box.hg	Thu Jul 18 12:51:15 2002
@@ -33,6 +33,13 @@
 namespace Gtk
 {
 
+/** Packing options for adding child widgets to a Box with pack_start() and pack_end(). */
+enum PackOptions {
+  CONTRACT, /**< Space is contracted to the child widget size. */
+  EXPAND_PADDING, /**< Space is expanded with extra space filled with padding. */
+  EXPAND_WIDGET /**< Space is expanded with extra space filled by increasing the child widget size. */
+};
+
 class Box;
 
 namespace Box_Helpers
@@ -70,7 +77,7 @@
 {
 public:
  Element(Widget& widget,
-          AttachOptions options = AttachOptions(FILL | EXPAND),
+          PackOptions options = EXPAND_WIDGET,
           guint padding=0,
           PackType pack=PACK_START)
       : widget_(&widget),options_(options),
@@ -78,7 +85,7 @@
     {}
 
   Widget* widget_;
-  AttachOptions options_;
+  PackOptions options_;
   guint padding_;
   PackType pack_;
 };
@@ -88,7 +95,7 @@
 struct EndElem : public Element
 {
   EndElem(Widget& widget,
-          AttachOptions options = AttachOptions(FILL | EXPAND),
+          PackOptions options = EXPAND_WIDGET,
           guint padding=0)
       : Element (widget,options,padding,PACK_END)
     {}
@@ -131,7 +138,7 @@
  * occupy the same amount of space.  Use set_spacing() to determine the minimum
  * space placed between all children in the Gtk::Box.  Use reorder_child() to
  * move a child widget to a different place in the box.  Use
- * set_child_packing() to reset the expand, fill, and padding attributes of any
+ * set_child_packing() to reset the pack options and padding attributes of any
  * Gtk::Box child. Use query_child_packing() to query these fields.
  */
 class Box : public Container
@@ -145,9 +152,9 @@
   _CTOR_DEFAULT
 public:
 
-  void pack_start(Widget& child, AttachOptions options = AttachOptions(FILL | EXPAND), guint padding = 0);
+  void pack_start(Widget& child, PackOptions options = EXPAND_WIDGET, guint padding = 0);
   _IGNORE(gtk_box_pack_start)
-  void pack_end(Widget& child, AttachOptions options = AttachOptions(FILL | EXPAND), guint padding = 0);
+  void pack_end(Widget& child, PackOptions options = EXPAND_WIDGET, guint padding = 0);
   _IGNORE(gtk_box_pack_end)
 
   _WRAP_METHOD(void set_homogeneous(bool homogeneous = true), gtk_box_set_homogeneous)
@@ -200,8 +207,8 @@
 
   /** Creates a new vertical box.
    * @param homogeneous Whether each widget in the VBox should have the same
-   * height.  If set, the expand argument to pack_start() or pack_end() is
-   * always turned on.
+   * height.  If set, a CONTRACT argument to pack_start() or pack_end() is
+   * ignored.
    * @param spacing Determines the space in pixels between child widgets.
    */
   _WRAP_CTOR(VBox(bool homogeneous = false, int spacing = 0), gtk_vbox_new)
@@ -230,8 +237,8 @@
 
   /** Creates a new horizontal box.
    * @param homogeneous Whether each widget in the HBox should have the same
-   * width.  If set, the expand argument to pack_start() or pack_end() is
-   * always turned on.
+   * width.  If set, a CONTRACT argument to pack_start() or pack_end() is
+   * ignored.
    * @param spacing Determines the space in pixels between child widgets.
    */
   _WRAP_CTOR(HBox(bool homogeneous = false, int spacing = 0), gtk_hbox_new)
Only in gtkmm-1.3.18-packoptions/gtk/src: box.hg~
diff -ur -x Makefile gtkmm-1.3.18/gtk/src/treeiter.hg gtkmm-1.3.18-packoptions/gtk/src/treeiter.hg
--- gtkmm-1.3.18/gtk/src/treeiter.hg	Sat Jul 13 12:57:00 2002
+++ gtkmm-1.3.18-packoptions/gtk/src/treeiter.hg	Thu Jul 18 10:50:24 2002
@@ -298,7 +298,7 @@
   //It's only for dynamically generated model columns.
 
   typedef typename Gtk::TreeModelColumn<ColumnType> type_cppcolumn;
-  typedef type_cppcolumn::ValueType ValueType;
+  typedef typename type_cppcolumn::ValueType ValueType;
 
   ValueType value;
   value.init(ValueType::value_type());
Only in gtkmm-1.3.18-packoptions/gtk/src: treeiter.hg~
