Mercurial > octave

comparison libinterp/corefcn/graphics.in.h @ 28079:999351c323ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove deprecated "oblique" value from fontangle graphics property * graphics.in.h: Remove "oblique" value from fontangle graphics property in text, uicontrol, uipanel, uibuttongroup, and uitable objects. * test/deprecate-props.tst: Update.
author John W. Eaton <jwe@octave.org>
date Mon, 17 Feb 2020 15:59:19 -0500
parents bd51beb6205e
children 044cea7947db
comparison
equal deleted inserted replaced
28078:376ca9022b7e 28079:999351c323ce
4362 color_property backgroundcolor , color_property (radio_values ("{none}"), color_values (1, 1, 1)) 4362 color_property backgroundcolor , color_property (radio_values ("{none}"), color_values (1, 1, 1))
4363 color_property color u , color_property (color_values (0, 0, 0), radio_values ("none")) 4363 color_property color u , color_property (color_values (0, 0, 0), radio_values ("none"))
4364 color_property edgecolor , color_property (radio_values ("{none}"), color_values (0, 0, 0)) 4364 color_property edgecolor , color_property (radio_values ("{none}"), color_values (0, 0, 0))
4365 bool_property editing , "off" 4365 bool_property editing , "off"
4366 array_property extent rG , Matrix (1, 4, 0.0) 4366 array_property extent rG , Matrix (1, 4, 0.0)
4367 // FIXME: DEPRECATED: Remove "oblique" in version 7. 4367 radio_property fontangle u , "{normal}|italic"
4368 radio_property fontangle u , "{normal}|italic|oblique"
4369 string_property fontname u , OCTAVE_DEFAULT_FONTNAME 4368 string_property fontname u , OCTAVE_DEFAULT_FONTNAME
4370 double_property fontsize u , 10 4369 double_property fontsize u , 10
4371 bool_property fontsmoothing u , "on" 4370 bool_property fontsmoothing u , "on"
4372 radio_property fontunits SU , "inches|centimeters|normalized|{points}|pixels" 4371 radio_property fontunits SU , "inches|centimeters|normalized|{points}|pixels"
4373 radio_property fontweight u , "{normal}|bold" 4372 radio_property fontweight u , "{normal}|bold"
4470 4469
4471 void update_fontangle (void) 4470 void update_fontangle (void)
4472 { 4471 {
4473 update_font (); 4472 update_font ();
4474 update_text_extent (); 4473 update_text_extent ();
4475 // FIXME: DEPRECATED: Remove warning for "oblique" in version 7.
4476 if (fontangle.is ("oblique"))
4477 warning_with_id ("Octave:deprecated-property",
4478 "Setting 'fontangle' to '%s' is deprecated, \
4479 use 'italic' or 'normal'.", fontangle.current_value ().c_str ());
4480 } 4474 }
4481 void update_fontweight (void) { update_font (); update_text_extent (); } 4475 void update_fontweight (void) { update_font (); update_text_extent (); }
4482 4476
4483 void update_interpreter (void) { update_text_extent (); } 4477 void update_interpreter (void) { update_text_extent (); }
4484 void update_horizontalalignment (void) { update_text_extent (); } 4478 void update_horizontalalignment (void) { update_text_extent (); }
5500 callback_property callback , Matrix () 5494 callback_property callback , Matrix ()
5501 array_property cdata , Matrix () 5495 array_property cdata , Matrix ()
5502 bool_property clipping , "on" 5496 bool_property clipping , "on"
5503 radio_property enable , "{on}|inactive|off" 5497 radio_property enable , "{on}|inactive|off"
5504 array_property extent rG , Matrix (1, 4, 0.0) 5498 array_property extent rG , Matrix (1, 4, 0.0)
5505 // FIXME: DEPRECATED: Remove "oblique" in version 7. 5499 radio_property fontangle u , "{normal}|italic"
5506 radio_property fontangle u , "{normal}|italic|oblique"
5507 string_property fontname u , OCTAVE_DEFAULT_FONTNAME 5500 string_property fontname u , OCTAVE_DEFAULT_FONTNAME
5508 double_property fontsize u , 10 5501 double_property fontsize u , 10
5509 radio_property fontunits S , "inches|centimeters|normalized|{points}|pixels" 5502 radio_property fontunits S , "inches|centimeters|normalized|{points}|pixels"
5510 radio_property fontweight u , "{normal}|bold" 5503 radio_property fontweight u , "{normal}|bold"
5511 color_property foregroundcolor , color_values (0, 0, 0) 5504 color_property foregroundcolor , color_values (0, 0, 0)
5551 void update_fontname (void) { update_text_extent (); } 5544 void update_fontname (void) { update_text_extent (); }
5552 void update_fontsize (void) { update_text_extent (); } 5545 void update_fontsize (void) { update_text_extent (); }
5553 void update_fontangle (void) 5546 void update_fontangle (void)
5554 { 5547 {
5555 update_text_extent (); 5548 update_text_extent ();
5556 // FIXME: DEPRECATED: Remove warning for "oblique" in version 7.
5557 if (fontangle.is ("oblique"))
5558 warning_with_id ("Octave:deprecated-property",
5559 "Setting 'fontangle' to '%s' is deprecated, \
5560 use 'italic' or 'normal'.", fontangle.current_value ().c_str ());
5561 } 5549 }
5562 void update_fontweight (void) { update_text_extent (); } 5550 void update_fontweight (void) { update_text_extent (); }
5563 5551
5564 void update_fontunits (const caseless_str& old_units); 5552 void update_fontunits (const caseless_str& old_units);
5565 5553
5616 BEGIN_PROPERTIES (uibuttongroup) 5604 BEGIN_PROPERTIES (uibuttongroup)
5617 color_property backgroundcolor , color_values (0.94, 0.94, 0.94) 5605 color_property backgroundcolor , color_values (0.94, 0.94, 0.94)
5618 radio_property bordertype , "none|{etchedin}|etchedout|beveledin|beveledout|line" 5606 radio_property bordertype , "none|{etchedin}|etchedout|beveledin|beveledout|line"
5619 double_property borderwidth , 1 5607 double_property borderwidth , 1
5620 bool_property clipping , "on" 5608 bool_property clipping , "on"
5621 // FIXME: DEPRECATED: Remove "oblique" in version 7. 5609 radio_property fontangle , "{normal}|italic"
5622 radio_property fontangle , "{normal}|italic|oblique"
5623 string_property fontname , OCTAVE_DEFAULT_FONTNAME 5610 string_property fontname , OCTAVE_DEFAULT_FONTNAME
5624 double_property fontsize , 10 5611 double_property fontsize , 10
5625 radio_property fontunits S , "inches|centimeters|normalized|{points}|pixels" 5612 radio_property fontunits S , "inches|centimeters|normalized|{points}|pixels"
5626 radio_property fontweight , "{normal}|bold" 5613 radio_property fontweight , "{normal}|bold"
5627 color_property foregroundcolor , color_values (0, 0, 0) 5614 color_property foregroundcolor , color_values (0, 0, 0)
5708 5695
5709 BEGIN_PROPERTIES (uipanel) 5696 BEGIN_PROPERTIES (uipanel)
5710 color_property backgroundcolor , color_values (0.94, 0.94, 0.94) 5697 color_property backgroundcolor , color_values (0.94, 0.94, 0.94)
5711 radio_property bordertype , "none|{etchedin}|etchedout|beveledin|beveledout|line" 5698 radio_property bordertype , "none|{etchedin}|etchedout|beveledin|beveledout|line"
5712 double_property borderwidth , 1 5699 double_property borderwidth , 1
5713 // FIXME: DEPRECATED: Remove "oblique" in version 7. 5700 radio_property fontangle , "{normal}|italic"
5714 radio_property fontangle , "{normal}|italic|oblique"
5715 string_property fontname , OCTAVE_DEFAULT_FONTNAME 5701 string_property fontname , OCTAVE_DEFAULT_FONTNAME
5716 double_property fontsize , 10 5702 double_property fontsize , 10
5717 radio_property fontunits S , "inches|centimeters|normalized|{points}|pixels" 5703 radio_property fontunits S , "inches|centimeters|normalized|{points}|pixels"
5718 radio_property fontweight , "{normal}|bold" 5704 radio_property fontweight , "{normal}|bold"
5719 color_property foregroundcolor , color_values (0, 0, 0) 5705 color_property foregroundcolor , color_values (0, 0, 0)
5802 any_property columnname , "numbered" 5788 any_property columnname , "numbered"
5803 any_property columnwidth S , "auto" 5789 any_property columnwidth S , "auto"
5804 any_property data u , Matrix () 5790 any_property data u , Matrix ()
5805 bool_property enable , "on" 5791 bool_property enable , "on"
5806 array_property extent rG , Matrix (1, 4, 0.0) 5792 array_property extent rG , Matrix (1, 4, 0.0)
5807 // FIXME: DEPRECATED: Remove "oblique" in version 7. 5793 radio_property fontangle u , "{normal}|italic"
5808 radio_property fontangle u , "{normal}|italic|oblique"
5809 string_property fontname u , OCTAVE_DEFAULT_FONTNAME 5794 string_property fontname u , OCTAVE_DEFAULT_FONTNAME
5810 double_property fontsize u , 10 5795 double_property fontsize u , 10
5811 radio_property fontunits S , "inches|centimeters|normalized|{points}|pixels" 5796 radio_property fontunits S , "inches|centimeters|normalized|{points}|pixels"
5812 radio_property fontweight u , "{normal}|bold" 5797 radio_property fontweight u , "{normal}|bold"
5813 color_property foregroundcolor , color_values (0, 0, 0) 5798 color_property foregroundcolor , color_values (0, 0, 0)
5844 void update_fontname (void) { update_table_extent (); } 5829 void update_fontname (void) { update_table_extent (); }
5845 void update_fontsize (void) { update_table_extent (); } 5830 void update_fontsize (void) { update_table_extent (); }
5846 void update_fontangle (void) 5831 void update_fontangle (void)
5847 { 5832 {
5848 update_table_extent (); 5833 update_table_extent ();
5849 // FIXME: DEPRECATED: Remove warning for "oblique" in version 7.
5850 if (fontangle.is ("oblique"))
5851 warning_with_id ("Octave:deprecated-property",
5852 "Setting 'fontangle' to '%s' is deprecated, \
5853 use 'italic' or 'normal'.", fontangle.current_value ().c_str ());
5854 } 5834 }
5855 void update_fontweight (void) { update_table_extent (); } 5835 void update_fontweight (void) { update_table_extent (); }
5856 }; 5836 };
5857 5837
5858 private: 5838 private: