diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx index 3f28d17ae3..7b91c8dd25 100644 --- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx +++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx @@ -5925,6 +5925,10 @@ write_function_instance(ostream &out, FunctionRemap *remap, indent(out, indent_level) << "return DTool_PyInit_Finalize(self, (void *)" << return_expr << ", &" << CLASS_PREFIX << make_safe_name(itype.get_scoped_name()) << ", true, false);\n"; + } else if (TypeManager::is_bool(orig_type)) { + // It's an error return boolean, I guess. Return 0 on success. + indent(out, indent_level) << "return (" << return_expr << ") ? 0 : -1;\n"; + } else if (TypeManager::is_integer(orig_type)) { if ((return_flags & RF_compare) == RF_compare) { // Make sure it returns -1, 0, or 1, or Python complains with: diff --git a/panda/src/text/textNode.h b/panda/src/text/textNode.h index eef4a7c25e..cb315e6744 100644 --- a/panda/src/text/textNode.h +++ b/panda/src/text/textNode.h @@ -239,6 +239,53 @@ PUBLISHED: PandaNode *get_internal_geom() const; +PUBLISHED: + MAKE_PROPERTY(max_rows, get_max_rows, set_max_rows); + MAKE_PROPERTY(frame_color, get_frame_color, set_frame_color); + MAKE_PROPERTY(card_color, get_card_color, set_card_color); + MAKE_PROPERTY(card_texture, get_card_texture, set_card_texture); + MAKE_PROPERTY(frame_line_width, get_frame_line_width, set_frame_line_width); + MAKE_PROPERTY(frame_corners, get_frame_corners, set_frame_corners); + MAKE_PROPERTY(transform, get_transform, set_transform); + MAKE_PROPERTY(coordinate_system, get_coordinate_system, set_coordinate_system); + MAKE_PROPERTY(usage_hint, get_usage_hint, set_usage_hint); + MAKE_PROPERTY(flatten_flags, get_flatten_flags, set_flatten_flags); + + MAKE_PROPERTY(text, get_text, set_text); + + MAKE_PROPERTY2(font, has_font, get_font, set_font, clear_font); + MAKE_PROPERTY2(small_caps, has_small_caps, get_small_caps, + set_small_caps, clear_small_caps); + MAKE_PROPERTY2(small_caps_scale, has_small_caps_scale, get_small_caps_scale, + set_small_caps_scale, clear_small_caps_scale); + MAKE_PROPERTY2(slant, has_slant, get_slant, set_slant, clear_slant); + MAKE_PROPERTY2(underscore, has_underscore, get_underscore, + set_underscore, clear_underscore); + MAKE_PROPERTY2(underscore_height, has_underscore_height, get_underscore_height, + set_underscore_height, clear_underscore_height); + MAKE_PROPERTY2(align, has_align, get_align, set_align, clear_align); + MAKE_PROPERTY2(indent, has_indent, get_indent, set_indent, clear_indent); + MAKE_PROPERTY2(wordwrap, has_wordwrap, get_wordwrap, set_wordwrap, clear_wordwrap); + MAKE_PROPERTY2(preserve_trailing_whitespace, + has_preserve_trailing_whitespace, get_preserve_trailing_whitespace, + set_preserve_trailing_whitespace, clear_preserve_trailing_whitespace); + MAKE_PROPERTY2(text_color, has_text_color, get_text_color, + set_text_color, clear_text_color); + MAKE_PROPERTY2(shadow_color, has_shadow_color, get_shadow_color, + set_shadow_color, clear_shadow_color); + MAKE_PROPERTY2(shadow, has_shadow, get_shadow, set_shadow, clear_shadow); + MAKE_PROPERTY2(bin, has_bin, get_bin, set_bin, clear_bin); + MAKE_PROPERTY2(draw_order, has_draw_order, get_draw_order, + set_draw_order, clear_draw_order); + MAKE_PROPERTY2(tab_width, has_tab_width, get_tab_width, + set_tab_width, clear_tab_width); + MAKE_PROPERTY2(glyph_scale, has_glyph_scale, get_glyph_scale, + set_glyph_scale, clear_glyph_scale); + MAKE_PROPERTY2(glyph_shift, has_glyph_shift, get_glyph_shift, + set_glyph_shift, clear_glyph_shift); + MAKE_PROPERTY2(text_scale, has_text_scale, get_text_scale, + set_text_scale, clear_text_scale); + public: // From parent class PandaNode virtual int get_unsafe_to_apply_attribs() const;