comparison src/DLD-FUNCTIONS/fltk_backend.cc @ 11239:5fa7667f90e5

Add prefix ID_ to property ids to avoid name clash on windows
author Kai Habel <kai.habel@gmx.de>
date Thu, 11 Nov 2010 15:01:03 +0100
parents e0db3f9e9267
children 830b940e7ff4
comparison
equal deleted inserted replaced
11238:1783b360976f 11239:5fa7667f90e5
794 figure::properties& figp = 794 figure::properties& figp =
795 dynamic_cast<figure::properties&> (fig.get_properties ()); 795 dynamic_cast<figure::properties&> (fig.get_properties ());
796 796
797 switch(id) 797 switch(id)
798 { 798 {
799 case base_properties::BEINGDELETED: 799 case base_properties::ID_BEINGDELETED:
800 uimenu->remove_from_menu (uimenup); 800 uimenu->remove_from_menu (uimenup);
801 break; 801 break;
802 case base_properties::VISIBLE: 802 case base_properties::ID_VISIBLE:
803 uimenu->update_visible (uimenup); 803 uimenu->update_visible (uimenup);
804 break; 804 break;
805 case uimenu::properties::ACCELERATOR: 805 case uimenu::properties::ID_ACCELERATOR:
806 uimenu->update_accelerator (uimenup); 806 uimenu->update_accelerator (uimenup);
807 break; 807 break;
808 case uimenu::properties::CALLBACK: 808 case uimenu::properties::ID_CALLBACK:
809 uimenu->update_callback (uimenup); 809 uimenu->update_callback (uimenup);
810 break; 810 break;
811 case uimenu::properties::CHECKED: 811 case uimenu::properties::ID_CHECKED:
812 uimenu->add_to_menu (figp);//rebuilding entire menu 812 uimenu->add_to_menu (figp);//rebuilding entire menu
813 break; 813 break;
814 case uimenu::properties::ENABLE: 814 case uimenu::properties::ID_ENABLE:
815 uimenu->update_enable (uimenup); 815 uimenu->update_enable (uimenup);
816 break; 816 break;
817 case uimenu::properties::FOREGROUNDCOLOR: 817 case uimenu::properties::ID_FOREGROUNDCOLOR:
818 uimenu->update_foregroundcolor (uimenup); 818 uimenu->update_foregroundcolor (uimenup);
819 break; 819 break;
820 case uimenu::properties::LABEL: 820 case uimenu::properties::ID_LABEL:
821 uimenu->add_to_menu (figp);//rebuilding entire menu 821 uimenu->add_to_menu (figp);//rebuilding entire menu
822 break; 822 break;
823 case uimenu::properties::POSITION: 823 case uimenu::properties::ID_POSITION:
824 uimenu->add_to_menu (figp);//rebuilding entire menu 824 uimenu->add_to_menu (figp);//rebuilding entire menu
825 break; 825 break;
826 case uimenu::properties::SEPARATOR: 826 case uimenu::properties::ID_SEPARATOR:
827 uimenu->update_seperator (uimenup); 827 uimenu->update_seperator (uimenup);
828 break; 828 break;
829 } 829 }
830 830
831 if (uimenu->items_to_show ()) 831 if (uimenu->items_to_show ())
1802 const figure::properties& fp = 1802 const figure::properties& fp =
1803 dynamic_cast<const figure::properties&> (go.get_properties ()); 1803 dynamic_cast<const figure::properties&> (go.get_properties ());
1804 1804
1805 switch (id) 1805 switch (id)
1806 { 1806 {
1807 case base_properties::VISIBLE: 1807 case base_properties::ID_VISIBLE:
1808 figure_manager::toggle_window_visibility (ov.string_value (), fp.is_visible ()); 1808 figure_manager::toggle_window_visibility (ov.string_value (), fp.is_visible ());
1809 break; 1809 break;
1810 case figure::properties::MENUBAR: 1810 case figure::properties::ID_MENUBAR:
1811 figure_manager::toggle_menubar_visibility (ov.string_value (), fp.menubar_is("figure")); 1811 figure_manager::toggle_menubar_visibility (ov.string_value (), fp.menubar_is("figure"));
1812 break; 1812 break;
1813 case figure::properties::NAME: 1813 case figure::properties::ID_NAME:
1814 case figure::properties::CURRENTAXES: 1814 case figure::properties::ID_CURRENTAXES:
1815 figure_manager::update_canvas (go.get_handle (), fp.get_currentaxes ()); 1815 figure_manager::update_canvas (go.get_handle (), fp.get_currentaxes ());
1816 break; 1816 break;
1817 case figure::properties::NUMBERTITLE: 1817 case figure::properties::ID_NUMBERTITLE:
1818 figure_manager::set_name (ov.string_value ()); 1818 figure_manager::set_name (ov.string_value ());
1819 break; 1819 break;
1820 } 1820 }
1821 } 1821 }
1822 } 1822 }
1823 else if (go.isa ("uimenu")) 1823 else if (go.isa ("uimenu"))
1824 { 1824 {
1825 if (id == uimenu::properties::LABEL) 1825 if (id == uimenu::properties::ID_LABEL)
1826 uimenu_set_fltk_label (go); 1826 uimenu_set_fltk_label (go);
1827 1827
1828 graphics_object fig = xget_ancestor(go,"figure"); 1828 graphics_object fig = xget_ancestor(go,"figure");
1829 figure_manager::uimenu_update(fig.get_handle (), go.get_handle (), id); 1829 figure_manager::uimenu_update(fig.get_handle (), go.get_handle (), id);
1830 } 1830 }