[glade--]adjustment.cc

[Mark Jones <mark jones106 verizon net>]

adjustment.cc that is in cvs seems to be in a bad state. look for the
lines below starting with my initials.


void Gtk_Adjustment::ConstructionArgs(const Widget &w, CxxFile &f) const
<<<<<<< adjustment.cc

MJ ^^^^^^ what is that?

{  
   if ( !GTKMM2 )
   {
      float value(w.getFloatProperty("value",0));
      float lower(w.getFloatProperty("lower",0));
      float upper(w.getFloatProperty("upper",100));
      float step(w.getFloatProperty("step",1));
      float page(w.getFloatProperty("page",10));
      float page_size(w.getFloatProperty("page_size",10));

      f.FunctionArg() << value;
      f.FunctionArg() << lower;
      f.FunctionArg() << upper;
      f.FunctionArg() << step;
      f.FunctionArg() << page;
      f.FunctionArg() << page_size;
   }
   else
   {
      int count = 0;
      std::list<std::string>  list;
      stringtok (list, w.getProperty("adjustment"));
      for (std::list<std::string>::iterator i = list.begin(); i !=
list.end(); ++i)
      {
          f.FunctionArg() << (*i);
      } 
   }
=======

MJ ^^^^^^ what is that?


{  float value=0,lower=0,upper=100,step=1,page=10,page_size=10;
   if (w.hasProperty("adjustment"))
   {  std::list<std::string>  list;
      stringtok (list, w.getProperty("adjustment"));
      for (std::list<std::string>::iterator i = list.begin(); i !=
list.end(); ++i)
      {  f.FunctionArg() << (*i);
      }
   }
   else
   {  value=w.getFloatProperty("value",value);
      lower=w.getFloatProperty("lower",lower);
      upper=w.getFloatProperty("upper",upper);
      step=w.getFloatProperty("step",step);
      page=w.getFloatProperty("page",page);
      page_size=w.getFloatProperty("page_size",page_size);

   f.FunctionArg() << value;
   f.FunctionArg() << lower;
   f.FunctionArg() << upper;
   f.FunctionArg() << step;
   f.FunctionArg() << page;
   f.FunctionArg() << page_size;
   }
>>>>>>> 1.18


MJ ^^^^^^ what is that?


}