Re: Complie error of gl-render.cc (MinGW build : concerning to uimenu?)

[Tatsuro MATSUOKA]

Hello Habel


#**************
This topic can be traced at
http://octave.1599824.n4.nabble.com/Complie-error-of-gl-render-cc-MinGW-build-concerning-to-uimenu-td3023073.html#a3023073
#***************


With your changeset I could build the recent (pulled at 2010-11-10) development,

I have tested menu_test.m

http://octave.1599824.n4.nabble.com/Implementation-of-uimenu-objects-for-fltk-backend-td2553340.html#a2553340
 
Menu bar consist of Entry1 to Entry9 was displayed.


Can you pushed the changeset to the development repository (or already done?) ?

Thanks Again !!

Regards

Tatsuro



--- Kai Habel wrote:



> Hello Tatsuro,
> 
> sorry for pointing you in the wrong direction. It seems fltk 1.1 also
> includes 'CALLBACK' somewhere. Can you try the attached Changeset. It
> adds the string "ID_" to all property-ids. (CALLBACK becomes
> ID_CALLBACK). Now it should compile with fltk 1.1 and 1.3
> 
> Kai
> 
> > # HG changeset patch
> # User Kai Habel <address@hidden>
> # Date 1289331205 -3600
> # Node ID 7c3e50b034dd7f1bb133adcee2f5c80869177f2a
> # Parent  51e6ac3e5afcebde4866d5d664d7760a84ffab2c
> [mq]: id_names
> 
> diff -r 51e6ac3e5afc -r 7c3e50b034dd src/DLD-FUNCTIONS/fltk_backend.cc
> --- a/src/DLD-FUNCTIONS/fltk_backend.cc       Mon Nov 08 21:22:22 2010 +0100
> +++ b/src/DLD-FUNCTIONS/fltk_backend.cc       Tue Nov 09 20:33:25 2010 +0100
> @@ -778,34 +778,34 @@
>          
>          switch(id)
>            {
> -            case base_properties::BEINGDELETED:
> +            case base_properties::ID_BEINGDELETED:
>                uimenu->remove_from_menu (uimenup);
>                break;
> -            case base_properties::VISIBLE:
> +            case base_properties::ID_VISIBLE:
>                uimenu->update_visible (uimenup);
>                break;
> -            case uimenu::properties::ACCELERATOR:
> +            case uimenu::properties::ID_ACCELERATOR:
>                uimenu->update_accelerator (uimenup);
>                break;
> -            case uimenu::properties::CALLBACK:
> +            case uimenu::properties::ID_CALLBACK:
>                uimenu->update_callback (uimenup);
>                break;
> -            case uimenu::properties::CHECKED:
> +            case uimenu::properties::ID_CHECKED:
>                uimenu->add_to_menu (figp);//rebuilding entire menu
>                break;
> -            case uimenu::properties::ENABLE:
> +            case uimenu::properties::ID_ENABLE:
>                uimenu->update_enable (uimenup);
>                break;
> -            case uimenu::properties::FOREGROUNDCOLOR:
> +            case uimenu::properties::ID_FOREGROUNDCOLOR:
>                uimenu->update_foregroundcolor (uimenup);
>                break;
> -            case uimenu::properties::LABEL:
> +            case uimenu::properties::ID_LABEL:
>                uimenu->add_to_menu (figp);//rebuilding entire menu
>                break;
> -            case uimenu::properties::POSITION:
> +            case uimenu::properties::ID_POSITION:
>                uimenu->add_to_menu (figp);//rebuilding entire menu
>                break;
> -            case uimenu::properties::SEPARATOR:
> +            case uimenu::properties::ID_SEPARATOR:
>                uimenu->update_seperator (uimenup);
>                break;
>            }
> @@ -1786,17 +1786,17 @@
>              
>              switch (id)
>                {
> -                case base_properties::VISIBLE:
> +                case base_properties::ID_VISIBLE:
>                    figure_manager::toggle_window_visibility (ov.string_value 
> (), fp.is_visible
> ());
>                    break;
> -                case figure::properties::MENUBAR:
> +                case figure::properties::ID_MENUBAR:
>                 figure_manager::toggle_menubar_visibility (ov.string_value 
> (), fp.menubar_is("figure"));
>                    break;
> -                case figure::properties::NAME:
> -             case figure::properties::CURRENTAXES:
> +                case figure::properties::ID_NAME:
> +             case figure::properties::ID_CURRENTAXES:
>                    figure_manager::update_canvas (go.get_handle (), 
> fp.get_currentaxes ());
>                    break;
> -                case figure::properties::NUMBERTITLE:
> +                case figure::properties::ID_NUMBERTITLE:
>                    figure_manager::set_name (ov.string_value ());
>                    break;
>                }
> @@ -1804,7 +1804,7 @@
>        }
>      else if (go.isa ("uimenu"))
>        {
> -        if (id == uimenu::properties::LABEL)
> +        if (id == uimenu::properties::ID_LABEL)
>            uimenu_set_fltk_label (go);
>          
>          graphics_object fig = xget_ancestor(go,"figure");
> diff -r 51e6ac3e5afc -r 7c3e50b034dd src/genprops.awk
> --- a/src/genprops.awk        Mon Nov 08 21:22:22 2010 +0100
> +++ b/src/genprops.awk        Tue Nov 09 20:33:25 2010 +0100
> @@ -283,7 +283,7 @@
>      printf ("  enum\n  {");
>      for (i = 1; i <= idx; i++)
>      {
> -      printf ("%s\n    %s = %d", (i == 1 ? "" : ","), toupper(name[i]), 
> pcount);
> +      printf ("%s\n    ID_%s = %d", (i == 1 ? "" : ","), toupper(name[i]), 
> pcount);
>        pcount++;
>      }
>      printf ("\n  };\n\n");
> @@ -425,7 +425,7 @@
>  ##    printf ("  insert_static_property (\"%s\", %s);\n", name[i], name[i]);
>        if (ptype[i])
>        {
> -        printf ("  %s.set_id (%s);\n", name[i], toupper(name[i]));
> +        printf ("  %s.set_id (ID_%s);\n", name[i], toupper(name[i]));
>          if (hidden[i])
>            printf ("  %s.set_hidden (true);\n", name[i]);
>        }
> diff -r 51e6ac3e5afc -r 7c3e50b034dd src/graphics.cc
> --- a/src/graphics.cc Mon Nov 08 21:22:22 2010 +0100
> +++ b/src/graphics.cc Tue Nov 09 20:33:25 2010 +0100
> @@ -2345,7 +2345,7 @@
>  
>            switch (id)
>              {
> -            case base_properties::VISIBLE:
> +            case base_properties::ID_VISIBLE:
>                if (! props.is_visible ())
>                  {
>                    send_quit (props.get___plot_stream__ ());
> 


--------------------------------------
Get the new Internet Explorer 8 optimized for Yahoo! JAPAN
http://pr.mail.yahoo.co.jp/ie8/