Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Interface fixes for Phoenix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-10-04 07:45:08 +00:00
parent ae97a3bdab
commit 9a0774600b
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/wx/apptrait.h
View File

@@ -97,7 +97,7 @@ public:
The returned reference is to a @c wxStandardPathsBase class but you The returned reference is to a @c wxStandardPathsBase class but you
can consider it to be equivalent to wxStandardPaths (which is documented). can consider it to be equivalent to wxStandardPaths (which is documented).
*/ */
virtual wxStandardPathsBase& GetStandardPaths(); virtual wxStandardPaths& GetStandardPaths();
/** /**
Returns the wxWidgets port ID used by the running program and eventually Returns the wxWidgets port ID used by the running program and eventually

4
interface/wx/cmndata.h
View File

@@ -446,6 +446,10 @@ public:
Assigns print data to this object. Assigns print data to this object.
*/ */
wxPrintData& operator =(const wxPrintData& data); wxPrintData& operator =(const wxPrintData& data);
wxString GetFilename() const;
void SetFilename( const wxString &filename );
}; };

12
interface/wx/dc.h
View File

@@ -380,7 +380,7 @@ public:
character with the given index if it is != -1 and return the bounding character with the given index if it is != -1 and return the bounding
rectangle if required. rectangle if required.
*/ */
void DrawLabel(const wxString& text, const wxBitmap& image, void DrawLabel(const wxString& text, const wxBitmap& bitmap,
const wxRect& rect, const wxRect& rect,
int alignment = wxALIGN_LEFT | wxALIGN_TOP, int alignment = wxALIGN_LEFT | wxALIGN_TOP,
int indexAccel = -1, wxRect* rectBounding = NULL); int indexAccel = -1, wxRect* rectBounding = NULL);
@@ -1562,6 +1562,14 @@ public:
void ResetTransformMatrix(); void ResetTransformMatrix();
//@} //@}
void SetLogicalScale(double x, double y);
void GetLogicalScale(double *x, double *y) const;
void SetLogicalOrigin(wxCoord x, wxCoord y);
void GetLogicalOrigin(wxCoord *x, wxCoord *y) const;
wxPoint GetLogicalOrigin() const;
}; };
@@ -1604,7 +1612,7 @@ public:
The clipping region is automatically unset when this object is destroyed. The clipping region is automatically unset when this object is destroyed.
*/ */
wxDCClipper(wxDC& dc, const wxRegion& r); wxDCClipper(wxDC& dc, const wxRegion& region);
wxDCClipper(wxDC& dc, const wxRect& rect); wxDCClipper(wxDC& dc, const wxRect& rect);
wxDCClipper(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h); wxDCClipper(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h);
//@} //@}

14
interface/wx/dcps.h
View File

@@ -19,22 +19,12 @@
class wxPostScriptDC : public wxDC class wxPostScriptDC : public wxDC
{ {
public: public:
wxPostScriptDC();
/** /**
Constructs a PostScript printer device context from a wxPrintData object. Constructs a PostScript printer device context from a wxPrintData object.
*/ */
wxPostScriptDC(const wxPrintData& printData); wxPostScriptDC(const wxPrintData& printData);
/**
Return resolution used in PostScript output.
@see SetResolution()
*/
virtual int GetResolution() const;
/**
Set resolution (in pixels per inch) that will be used in PostScript
output. Default is 720ppi.
*/
virtual wxRect GetPaperRect() const;
}; };