Looking for comments on new functions and macros organization of Doxygen docs shown with this commit, see wx-dev.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -739,7 +739,9 @@ public:
|
||||
// Global functions/macros
|
||||
// ============================================================================
|
||||
|
||||
/** @addtogroup group_gdi */
|
||||
//@{
|
||||
|
||||
/**
|
||||
Returns the dimensions of the work area on the display. On Windows
|
||||
this means the area not covered by the taskbar, etc. Other platforms
|
||||
@@ -749,23 +751,18 @@ public:
|
||||
void wxClientDisplayRect(int* x, int* y, int* width,
|
||||
int* height);
|
||||
wxRect wxGetClientDisplayRect();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
/**
|
||||
Returns the display size in pixels.
|
||||
*/
|
||||
void wxDisplaySize(int* width, int* height);
|
||||
wxSize wxGetDisplaySize();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
/**
|
||||
Returns the display size in millimeters.
|
||||
*/
|
||||
void wxDisplaySizeMM(int* width, int* height);
|
||||
wxSize wxGetDisplaySizeMM();
|
||||
//@}
|
||||
|
||||
/**
|
||||
This macro loads an icon from either application resources (on the platforms
|
||||
@@ -788,10 +785,12 @@ bool wxColourDisplay();
|
||||
|
||||
@see @ref overview_wxbitmapoverview, wxICON()
|
||||
*/
|
||||
#define wxBITMAP() /* implementation is private */
|
||||
#define wxBITMAP() /* implementation is private */
|
||||
|
||||
/**
|
||||
Returns the depth of the display (a value of 1 denotes a monochrome display).
|
||||
*/
|
||||
int wxDisplayDepth();
|
||||
|
||||
//@}
|
||||
|
||||
|
@@ -117,27 +117,30 @@ public:
|
||||
// Global functions/macros
|
||||
// ============================================================================
|
||||
|
||||
/** @addtogroup group_gdi */
|
||||
//@{
|
||||
|
||||
/**
|
||||
@header{wx/metafile.h}
|
||||
|
||||
Given a filename for an existing, valid metafile (as constructed using
|
||||
wxMetafileDC)
|
||||
makes it into a placeable metafile by prepending a header containing the given
|
||||
bounding box. The bounding box may be obtained from a device context after
|
||||
drawing
|
||||
into it, using the functions wxDC::MinX, wxDC::MinY, wxDC::MaxX and wxDC::MaxY.
|
||||
In addition to adding the placeable metafile header, this function adds
|
||||
the equivalent of the following code to the start of the metafile data:
|
||||
wxMetafileDC) makes it into a placeable metafile by prepending a header
|
||||
containing the given bounding box. The bounding box may be obtained from a
|
||||
device context after drawing into it, using the functions wxDC::MinX(),
|
||||
wxDC::MinY(), wxDC::MaxX() and wxDC::MaxY(). In addition to adding the
|
||||
placeable metafile header, this function adds the equivalent of the
|
||||
following code to the start of the metafile data:
|
||||
|
||||
@code
|
||||
SetMapMode(dc, MM_ANISOTROPIC);
|
||||
SetWindowOrg(dc, minX, minY);
|
||||
SetWindowExt(dc, maxX - minX, maxY - minY);
|
||||
SetWindowOrg(dc, minX, minY);
|
||||
SetWindowExt(dc, maxX - minX, maxY - minY);
|
||||
@endcode
|
||||
|
||||
This simulates the wxMM_TEXT mapping mode, which wxWidgets assumes.
|
||||
Placeable metafiles may be imported by many Windows applications, and can be
|
||||
used in RTF (Rich Text Format) files.
|
||||
@a scale allows the specification of scale for the metafile.
|
||||
This function is only available under Windows.
|
||||
Placeable metafiles may be imported by many Windows applications, and can
|
||||
be used in RTF (Rich Text Format) files. @a scale allows the specification
|
||||
of scale for the metafile. This function is only available under Windows.
|
||||
*/
|
||||
bool wxMakeMetafilePlaceable(const wxString& filename, int minX,
|
||||
int minY,
|
||||
@@ -145,3 +148,5 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int minX,
|
||||
int maxY,
|
||||
float scale = 1.0);
|
||||
|
||||
//@}
|
||||
|
||||
|
Reference in New Issue
Block a user