[glade--]Re: adjustment.cc

[Mark Jones <mark jones106 verizon net>]

What I wrote before might not be what I thought it was.  I tried
deleting the two files and then updating it again and did not see this. 
Was this something CVS put in my local file while comparing my version
to the CVS version?  I'm new to CVS so it would not surprise me to learn
it was something like that.  But, then again, I would be surprised to
see that it would "markup" a file instead of fully updating it, leaving
it in an incorrect state (from a syntax standpoint).

I guess it is possible between the time I wrote this (below) and a few
minutes ago that it was updated with a correction for this.  Anyway, I
look forward to finding out what this was about.

Mark

On Thu, 2002-12-19 at 14:36, Mark Jones wrote:
> 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?
> 
> 
> }
-- 
Mark Jones <mark jones106 verizon net>