Menu
▾
▴
[adobe-source-commits] sandbox/visual_refactor/adobe/test/visual/headers/win ui_core_implementation.hpp,1.2,1.3
|
From: Foster B. <fos...@us...> - 2005-04-20 00:26:49
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12747/adobe/test/visual/headers/win Modified Files: ui_core_implementation.hpp Log Message: Building again on Win32 Index: ui_core_implementation.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/win/ui_core_implementation.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ui_core_implementation.hpp 19 Apr 2005 17:55:56 -0000 1.2 --- ui_core_implementation.hpp 20 Apr 2005 00:25:40 -0000 1.3 *************** *** 44,48 **** #ifndef NDEBUG ! struct hitless_t : boost::totally_ordered<hitless_t> { struct implementation_t; --- 44,48 ---- #ifndef NDEBUG ! struct hitless_t : boost::equality_comparable<hitless_t> { struct implementation_t; *************** *** 55,65 **** void initialize(window_t& window); ! void set_bounds(const point_t& position, const extents_t& geometry); private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t); ! friend void frame_geometry(window_t& window, const point_t& position, const extents_t& geometry); ! friend bool clear_geometry_frames(window_t& window); implementation_t* object_m; --- 55,65 ---- void initialize(window_t& window); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t); ! friend void frame_extents(window_t& window, const point_2d_t& position, const extents_t& geometry); ! friend bool clear_extents_frames(window_t& window); implementation_t* object_m; *************** *** 73,79 **** /****************************************************************************************************/ ! struct control_t : boost::totally_ordered<control_t> { control_t(); control_t(const control_t& rhs); --- 73,80 ---- /****************************************************************************************************/ ! struct control_t : boost::equality_comparable<control_t> { control_t(); + control_t(theme_t theme); control_t(const control_t& rhs); *************** *** 82,86 **** virtual extents_t best_bounds(); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_name(const std::string& name); virtual void set_theme(theme_t theme); --- 83,87 ---- virtual extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_name(const std::string& name); virtual void set_theme(theme_t theme); *************** *** 109,113 **** virtual void modify(modifiers_t modifiers); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::control_t); virtual dictionary_t essentials() const; --- 110,114 ---- virtual void modify(modifiers_t modifiers); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::control_t); virtual dictionary_t essentials() const; *************** *** 120,124 **** implementation::control_focus_proc_t focus_proc_m; extents_t geometry_m; // saving set_bounds param for essentials ! point_t position_m; // saving set_bounds param for widget framing int uxtheme_type_m; static HWND invisible_parent_m; // an invisible window used as the initial parent for all controls. --- 121,125 ---- implementation::control_focus_proc_t focus_proc_m; extents_t geometry_m; // saving set_bounds param for essentials ! point_2d_t position_m; // saving set_bounds param for widget framing int uxtheme_type_m; static HWND invisible_parent_m; // an invisible window used as the initial parent for all controls. *************** *** 132,136 **** /****************************************************************************************************/ ! struct window_t::implementation_t : boost::totally_ordered<window_t::implementation_t> { implementation_t(); --- 133,137 ---- /****************************************************************************************************/ ! struct window_t::implementation_t : boost::equality_comparable<window_t::implementation_t> { implementation_t(); *************** *** 149,153 **** DWORD style); ! void set_bounds(const point_t& position, const extents_t& geometry); void reposition(window_reposition_t position); void set_visible(bool make_visible); --- 150,154 ---- DWORD style); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void reposition(window_reposition_t position); void set_visible(bool make_visible); *************** *** 155,159 **** void signal_resize_complete(const implementation::window_resize_complete_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::window_t::implementation_t); dictionary_t essentials() const; --- 156,160 ---- void signal_resize_complete(const implementation::window_resize_complete_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::window_t::implementation_t); dictionary_t essentials() const; *************** *** 196,200 **** virtual extents_t best_bounds(); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t::implementation_t); virtual dictionary_t essentials() const; --- 197,201 ---- virtual extents_t best_bounds(); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 220,224 **** virtual LRESULT event(UINT msg, WPARAM wParam, LPARAM lParam); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::tab_group_t::implementation_t); virtual dictionary_t essentials() const; --- 221,225 ---- virtual LRESULT event(UINT msg, WPARAM wParam, LPARAM lParam); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::tab_group_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 237,241 **** implementation_t(const implementation_t& rhs); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::panel_t::implementation_t); virtual dictionary_t essentials() const; --- 238,242 ---- implementation_t(const implementation_t& rhs); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::panel_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 265,269 **** virtual void modify(modifiers_t modifiers); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::button_t::implementation_t); virtual dictionary_t essentials() const; --- 266,270 ---- virtual void modify(modifiers_t modifiers); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::button_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 289,293 **** void signal_hit(const implementation::radio_button_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::radio_button_t::implementation_t); virtual dictionary_t essentials() const; --- 290,294 ---- void signal_hit(const implementation::radio_button_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::radio_button_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 305,316 **** typedef control_t _super; ! implementation_t(); implementation_t(const implementation_t& rhs); void initialize(const RECT& bounds, const std::string& name); ! virtual void set_value(std::size_t is_checked); void signal_hit(const implementation::checkbox_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::checkbox_t::implementation_t); virtual dictionary_t essentials() const; --- 306,325 ---- typedef control_t _super; ! implementation_t( const std::string& name, ! adobe::value_t true_value, ! adobe::value_t false_value, ! theme_t theme); ! implementation_t(const implementation_t& rhs); void initialize(const RECT& bounds, const std::string& name); ! ! virtual extents_t measure(); ! ! virtual void set_value(adobe::value_t new_value); ! void signal_hit(const implementation::checkbox_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::checkbox_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 319,323 **** implementation::checkbox_hit_proc_t hit_proc_m; ! bool is_checked_m; }; --- 328,334 ---- implementation::checkbox_hit_proc_t hit_proc_m; ! adobe::value_t true_value_m; ! adobe::value_t false_value_m; ! adobe::value_t current_value_m; }; *************** *** 332,336 **** void initialize(const RECT& bounds); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_value(bool value); void set_visible(bool make_visible); --- 343,347 ---- void initialize(const RECT& bounds); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_value(bool value); void set_visible(bool make_visible); *************** *** 338,347 **** void signal_hit(const implementation::link_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::link_t::implementation_t); virtual dictionary_t essentials() const; implementation::link_hit_proc_t hit_proc_m; ! points_of_interest_t prongs_m; bool value_m; bool visible_m; --- 349,358 ---- void signal_hit(const implementation::link_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::link_t::implementation_t); virtual dictionary_t essentials() const; implementation::link_hit_proc_t hit_proc_m; ! guide_set_t prongs_m; bool value_m; bool visible_m; *************** *** 366,370 **** void set_value(long value); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t::implementation_t); virtual dictionary_t essentials() const; --- 377,381 ---- void set_value(long value); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 383,387 **** implementation_t(const implementation_t& rhs); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::separator_t::implementation_t); virtual dictionary_t essentials() const; --- 394,398 ---- implementation_t(const implementation_t& rhs); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::separator_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 404,408 **** void signal_hit(const implementation::static_text_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t::implementation_t); virtual dictionary_t essentials() const; --- 415,419 ---- void signal_hit(const implementation::static_text_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 429,433 **** static_text_t& get_label(); virtual extents_t best_bounds(); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 440,444 ---- static_text_t& get_label(); virtual extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); *************** *** 448,452 **** virtual LRESULT event(UINT msg, WPARAM wParam, LPARAM lParam); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::edit_text_t::implementation_t); virtual dictionary_t essentials() const; --- 459,463 ---- virtual LRESULT event(UINT msg, WPARAM wParam, LPARAM lParam); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::edit_text_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 484,488 **** static_text_t& get_label(); virtual extents_t best_bounds(); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 495,499 ---- static_text_t& get_label(); virtual extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); *************** *** 496,500 **** virtual LRESULT event(UINT message, WPARAM wParam, LPARAM lParam); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::popup_t::implementation_t); virtual dictionary_t essentials() const; --- 507,511 ---- virtual LRESULT event(UINT message, WPARAM wParam, LPARAM lParam); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::popup_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 528,532 **** popup_t& get_popup(); virtual extents_t best_bounds(); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 539,543 ---- popup_t& get_popup(); virtual extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); *************** *** 537,541 **** void signal_popup_value_change(implementation::popup_value_proc_t proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::unit_edit_text_t::implementation_t); virtual dictionary_t essentials() const; --- 548,552 ---- void signal_popup_value_change(implementation::popup_value_proc_t proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::unit_edit_text_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 568,572 **** void signal_value_change(const implementation::slider_value_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::slider_t::implementation_t); virtual dictionary_t essentials() const; --- 579,583 ---- void signal_value_change(const implementation::slider_value_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::slider_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 601,605 **** void signal_value_change(const implementation::bevel_button_popup_value_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::bevel_button_t::implementation_t); virtual dictionary_t essentials() const; --- 612,616 ---- void signal_value_change(const implementation::bevel_button_popup_value_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::bevel_button_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 653,660 **** void initialize(const RECT& bounds, HWND window); ! void set_bounds(const point_t& position, const extents_t& geometry); void overlay_bounds_update(); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t::implementation_t); virtual dictionary_t essentials() const; --- 664,671 ---- void initialize(const RECT& bounds, HWND window); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void overlay_bounds_update(); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 668,690 **** /****************************************************************************************************/ ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::window_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::control_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::group_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::tab_group_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::button_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::panel_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::radio_button_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::checkbox_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::link_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::progress_bar_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::separator_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::static_text_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::edit_text_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::popup_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::unit_edit_text_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::slider_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::bevel_button_t::implementation_t); #ifndef NDEBUG ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::hitless_t::implementation_t); #endif // NDEBUG --- 679,701 ---- /****************************************************************************************************/ ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::window_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::control_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::group_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::tab_group_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::button_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::panel_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::radio_button_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::checkbox_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::link_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::progress_bar_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::separator_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::static_text_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::edit_text_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::popup_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::unit_edit_text_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::slider_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::bevel_button_t::implementation_t); #ifndef NDEBUG ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::hitless_t::implementation_t); #endif // NDEBUG |
