|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:37
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/test/visual/headers/win Modified Files: ui_core_implementation.hpp Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup 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.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui_core_implementation.hpp 18 Apr 2005 21:16:03 -0000 1.1 --- ui_core_implementation.hpp 19 Apr 2005 17:55:56 -0000 1.2 *************** *** 19,23 **** #include <adobe/future/memory.hpp> ! #include <adobe/rectangle.hpp> #include <adobe/dictionary_fwd.hpp> --- 19,23 ---- #include <adobe/future/memory.hpp> ! #include <adobe/extents.hpp> #include <adobe/dictionary_fwd.hpp> *************** *** 55,64 **** void initialize(window_t& window); ! void set_bounds(const point_t& position, const rectangle_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 rectangle_t& geometry); friend bool clear_geometry_frames(window_t& window); --- 55,64 ---- 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); *************** *** 80,86 **** virtual ~control_t(); ! virtual rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_name(const std::string& name); virtual void set_theme(theme_t theme); --- 80,86 ---- virtual ~control_t(); ! 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); *************** *** 119,123 **** theme_t theme_m; implementation::control_focus_proc_t focus_proc_m; ! rectangle_t geometry_m; // saving set_bounds param for essentials point_t position_m; // saving set_bounds param for widget framing int uxtheme_type_m; --- 119,123 ---- theme_t theme_m; 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; *************** *** 149,153 **** DWORD style); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void reposition(window_reposition_t position); void set_visible(bool make_visible); --- 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); *************** *** 160,164 **** HWND window_m; ! rectangle_t geometry_m; // saving set_bounds param for essentials implementation::window_resize_complete_proc_t resize_complete_proc_m; #ifndef NDEBUG --- 160,164 ---- HWND window_m; ! extents_t geometry_m; // saving set_bounds param for essentials implementation::window_resize_complete_proc_t resize_complete_proc_m; #ifndef NDEBUG *************** *** 194,198 **** void initialize( const RECT& bounds, const std::string& name); ! virtual rectangle_t best_bounds(); ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t::implementation_t); --- 194,198 ---- void initialize( const RECT& bounds, const std::string& name); ! virtual extents_t best_bounds(); ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t::implementation_t); *************** *** 215,219 **** const tab_group_t::tab_t* last); virtual void set_theme(theme_t theme); ! virtual rectangle_t best_bounds(); void set_value(const value_t& new_value); void signal_value_change(const implementation::tab_group_value_proc_t& proc); --- 215,219 ---- const tab_group_t::tab_t* last); virtual void set_theme(theme_t theme); ! virtual extents_t best_bounds(); void set_value(const value_t& new_value); void signal_value_change(const implementation::tab_group_value_proc_t& proc); *************** *** 332,336 **** void initialize(const RECT& bounds); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_value(bool value); void set_visible(bool make_visible); --- 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); *************** *** 361,365 **** pb_style_t bar_style, bool is_vertical); ! virtual rectangle_t best_bounds(); void set_min_value(long min_value); void set_max_value(long max_value); --- 361,365 ---- pb_style_t bar_style, bool is_vertical); ! virtual extents_t best_bounds(); void set_min_value(long min_value); void set_max_value(long max_value); *************** *** 428,433 **** long rows); static_text_t& get_label(); ! virtual rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 428,433 ---- long rows); 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); *************** *** 483,488 **** void initialize(const RECT& bounds, const std::string& name); static_text_t& get_label(); ! virtual rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 483,488 ---- void initialize(const RECT& bounds, const std::string& name); 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); *************** *** 527,532 **** long rows); popup_t& get_popup(); ! virtual rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 527,532 ---- long rows); 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); *************** *** 562,566 **** slider_style_t style, long num_tick_marks); ! virtual rectangle_t best_bounds(); void set_min_value(long min_value); void set_max_value(long max_value); --- 562,566 ---- slider_style_t style, long num_tick_marks); ! virtual extents_t best_bounds(); void set_min_value(long min_value); void set_max_value(long max_value); *************** *** 653,657 **** void initialize(const RECT& bounds, HWND window); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void overlay_bounds_update(); --- 653,657 ---- void initialize(const RECT& bounds, HWND window); ! void set_bounds(const point_t& position, const extents_t& geometry); void overlay_bounds_update(); |