[adobe-source-commits] sandbox/adobe-source/adobe/test/visual/headers/win metrics.hpp,1.1,1.2

[Ralph T. <ra...@us...>]

Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers/win
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18001/adobe-source/adobe/test/visual/headers/win

Modified Files:
	metrics.hpp 
Log Message:
metrics_t now has a default windows implementation (which currently only supports
 fonts). It also dynamically loads UxTheme.dll, so that everything runs fine on old
 windows.

Index: metrics.hpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers/win/metrics.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** metrics.hpp	1 Apr 2005 19:11:49 -0000	1.1
--- metrics.hpp	2 Apr 2005 00:45:21 -0000	1.2
***************
*** 47,58 ****
  //
  class metrics_t {
- 	struct implementation_t;
- 	implementation_t* object_m;
- 	//
- 	/// All constructors are private to enforce singleton nature
- 	/// of metrics_t.
- 	//
- 	metrics_t();
- 	~metrics_t();
    public:
  	//
--- 47,50 ----
***************
*** 72,76 ****
  	///		the font could not be returned.
  	//
! 	bool get_font(int widget_type, LOGFONTW& out_font);
  	//
  	/// Get the metrics for the font which should be used in the given widget.
--- 64,68 ----
  	///		the font could not be returned.
  	//
! 	virtual bool get_font(int widget_type, LOGFONTW& out_font) const = 0;
  	//
  	/// Get the metrics for the font which should be used in the given widget.
***************
*** 82,86 ****
  	///		if the metrics could not be returned.
  	//
! 	bool get_font_metrics(int widget_type, TEXTMETRIC& out_metrics);
  	//
  	/// Get the extents for the given text string, to be contained in the
--- 74,78 ----
  	///		if the metrics could not be returned.
  	//
! 	virtual bool get_font_metrics(int widget_type, TEXTMETRIC& out_metrics) const = 0;
  	//
  	/// Get the extents for the given text string, to be contained in the
***************
*** 94,98 ****
  	///		if the metrics could not be returned.
  	//
! 	bool get_text_extents(int widget_type, std::wstring text, RECT& out_extents);
  	//
  	/// Get the specified measurement for the given widget when in the
--- 86,90 ----
  	///		if the metrics could not be returned.
  	//
! 	virtual bool get_text_extents(int widget_type, std::wstring text, RECT& out_extents) const = 0;
  	//
  	/// Get the specified measurement for the given widget when in the
***************
*** 106,110 ****
  	///		if the value could not be found.
  	//
! 	bool get_integer(int widget_type, int measurement, int& out_val);
  	//
  	/// Get the size of the specified widget.
--- 98,102 ----
  	///		if the value could not be found.
  	//
! 	virtual bool get_integer(int widget_type, int measurement, int& out_val) const = 0;
  	//
  	/// Get the size of the specified widget.
***************
*** 117,121 ****
  	///		if the rectangle could not be found.
  	//
! 	bool get_size(int widget_type, THEMESIZE measurement, SIZE& out_size);
  	//
  	/// Get the margins for the specified widget. Typically the margins
--- 109,113 ----
  	///		if the rectangle could not be found.
  	//
! 	virtual bool get_size(int widget_type, THEMESIZE measurement, SIZE& out_size) const = 0;
  	//
  	/// Get the margins for the specified widget. Typically the margins
***************
*** 129,133 ****
  	///		if the margins could not be found.
  	//
! 	bool get_margins(int widget_type, MARGINS& out_margins);
  	//
  	/// Before any of the other functions can be called, the theme data must be
--- 121,125 ----
  	///		if the margins could not be found.
  	//
! 	virtual bool get_margins(int widget_type, MARGINS& out_margins) const = 0;
  	//
  	/// Before any of the other functions can be called, the theme data must be
***************
*** 142,146 ****
  	///		theme could not be obtained from the window.
  	//
! 	bool set_window(HWND window);
  };
  
--- 134,138 ----
  	///		theme could not be obtained from the window.
  	//
! 	virtual bool set_window(HWND window) = 0;
  };