? packbox.patch
? examples/book/menus/Makefile
? examples/book/menus/Makefile.in
? examples/book/menus/main_menu/Makefile
? examples/book/menus/main_menu/Makefile.in
? examples/book/menus/main_menu/main_menu
? examples/book/menus/popup/Makefile
? examples/book/menus/popup/Makefile.in
? examples/book/menus/popup/popup
? examples/book/signals/Makefile
? examples/book/signals/Makefile.in
? examples/book/signals/custom/Makefile
? examples/book/signals/custom/Makefile.in
? examples/book/signals/custom/example
? gtk/gtkmm/separatormenuitem.cc
? gtk/gtkmm/separatormenuitem.h
? gtk/gtkmm/private/separatormenuitem_p.h
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkmm-root/base/ChangeLog,v
retrieving revision 1.409
diff -u -b -B -u -r1.409 ChangeLog
--- ChangeLog	19 Jul 2002 19:46:27 -0000	1.409
+++ ChangeLog	19 Jul 2002 22:37:07 -0000
@@ -1,3 +1,9 @@
+2002-07-19  Michael Babcock  <mbabcock@la.creatureshop.henson.com>
+
+	* examples/packbox/packbox.cc: Make button labels display
+	PackOptions instead of bool,bool. Also fix code to match comments
+	so it actually shows the different packing options.
+
 2002-07-19  Jarek Dukat  <madmaxer@poczta.fm>
  
  	* gtk/src/treeiter.hg: Added typename declaration for gcc 3.1.
Index: examples/packbox/packbox.cc
===================================================================
RCS file: /cvs/gnome/gtkmm-root/examples/packbox/packbox.cc,v
retrieving revision 1.10
diff -u -b -B -u -r1.10 packbox.cc
--- examples/packbox/packbox.cc	19 Jul 2002 15:59:07 -0000	1.10
+++ examples/packbox/packbox.cc	19 Jul 2002 22:37:10 -0000
@@ -10,38 +10,34 @@
 using std::cerr;
 using std::endl;
 
-// Gtk-- version of the "packbox" example from the gtk+ tutorial
+// Gtkmm version of the "packbox" example from the gtk+ tutorial
 
 
 class PackBox : public Gtk::HBox
 {
 public:
   PackBox(bool homogeneous, int spacing, Gtk::PackOptions, int padding = 0);
-  virtual ~PackBox() { delete m_button6; }
+  virtual ~PackBox() { delete m_button4; }
 
-  Gtk::Button m_button1, m_button2, m_button3, m_button4, m_button5,
-    *m_button6;
+  Gtk::Button m_button1, m_button2, m_button3, *m_button4;
   char padstr[80];
 };
 
 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::PACK_EXPAND_PADDING) || (options == Gtk::PACK_EXPAND_WIDGET)) ? "true," : "false,"),
-  m_button5( (options == Gtk::PACK_EXPAND_WIDGET) ? "true," : "false,")
+  m_button1("box.pack_start("),
+  m_button2("button,"),
+  m_button3((options == Gtk::PACK_SHRINK) ? "Gtk::PACK_SHRINK" :
+            ((options == Gtk::PACK_EXPAND_PADDING) ? "Gtk::PACK_EXPAND_PADDING" : "Gtk::PACK_EXPAND_WIDGET"))
 {
   pack_start(m_button1, options, padding);
   pack_start(m_button2, options, padding);
   pack_start(m_button3, options, padding);
-  pack_start(m_button4, options, padding);
-  pack_start(m_button5, options, padding);
 
   sprintf(padstr, "%d);", padding);
   
-  m_button6 = new Gtk::Button(padstr);
-  pack_start(*m_button6, options, padding);
+  m_button4 = new Gtk::Button(padstr);
+  pack_start(*m_button4, options, padding);
 }
 
   
@@ -84,17 +80,17 @@
     m_box1.pack_start(*m_label1, Gtk::PACK_SHRINK);
 
     // Create a PackBox - homogeneous = false, spacing = 0,
-    // expand = false, fill = false, padding = 0 
+    // options = Gtk::PACK_SHRINK, padding = 0 
     m_packbox1 = manage(new PackBox(false, 0, Gtk::PACK_SHRINK));
     m_box1.pack_start(*m_packbox1, Gtk::PACK_SHRINK);
 
     // Create a PackBox - homogeneous = false, spacing = 0,
-    // expand = true, fill = false, padding = 0 
-    m_packbox2 = manage(new PackBox(false, 0, Gtk::PACK_SHRINK));
+    // options = Gtk::PACK_EXPAND_PADDING, padding = 0 
+    m_packbox2 = manage(new PackBox(false, 0, Gtk::PACK_EXPAND_PADDING));
     m_box1.pack_start(*m_packbox2, Gtk::PACK_SHRINK);
 
     // Create a PackBox - homogeneous = false, spacing = 0,
-    // expand = true, fill = true, padding = 0 
+    // options = Gtk::PACK_EXPAND_WIDGET, padding = 0 
     m_packbox3 = manage(new PackBox(false, 0, Gtk::PACK_EXPAND_WIDGET));
     m_box1.pack_start(*m_packbox3, Gtk::PACK_SHRINK);
     
@@ -108,12 +104,12 @@
     m_label2->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_TOP);
     m_box1.pack_start(*m_label2, Gtk::PACK_SHRINK);
     
-    // Args are: homogeneous, spacing, expand, fill, padding
+    // Args are: homogeneous, spacing, options, padding
     m_packbox4 = manage(new PackBox(true, 0, Gtk::PACK_EXPAND_PADDING));
     m_box1.pack_start(*m_packbox4, Gtk::PACK_SHRINK);
 
-    // Args are: homogeneous, spacing, expand, fill, padding
-    m_packbox5 = manage(new PackBox(true, 0, Gtk::PACK_EXPAND_PADDING));
+    // Args are: homogeneous, spacing, options, padding
+    m_packbox5 = manage(new PackBox(true, 0, Gtk::PACK_EXPAND_WIDGET));
     m_box1.pack_start(*m_packbox5, Gtk::PACK_SHRINK);
 
     m_box1.pack_start(m_seperator2, Gtk::SHRINK, 5);
@@ -179,7 +175,7 @@
   m_buttonQuit.signal_clicked().connect(SigC::slot(&Gtk::Main::quit));
 
   // pack the button into the quitbox.
-  // The last 3 arguments to gtk_box_pack_start are: expand, fill, padding. 
+  // The last 2 arguments to Box::pack_start are: options, padding. 
   m_boxQuit.pack_start(m_buttonQuit, Gtk::PACK_EXPAND_PADDING);
   m_box1.pack_start(m_boxQuit, Gtk::PACK_SHRINK);
   
