Interface fixes for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/apptrait.h b/interface/wx/apptrait.h
index 15dd77450bbc38ec42a77c18abd30e37980d07a1..a531847a2b3993739333800341f3f67b53d7f1e2 100644 (file)
--- a/interface/wx/apptrait.h
+++ b/interface/wx/apptrait.h
@@ -97,7 +97,7 @@ public:
         The returned reference is to a @c wxStandardPathsBase class but you
         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

diff --git a/interface/wx/cmndata.h b/interface/wx/cmndata.h
index eb43b0056bc1e2c3d62f2c01ce5030bd9196c2e6..6a655569f663c712223b1532f76beff55fe6c230 100644 (file)
--- a/interface/wx/cmndata.h
+++ b/interface/wx/cmndata.h
@@ -446,6 +446,10 @@ public:
         Assigns print data to this object.
     */
     wxPrintData& operator =(const wxPrintData& data);
+
+
+    wxString GetFilename() const;
+    void SetFilename( const wxString &filename );
 };
 
 

diff --git a/interface/wx/dc.h b/interface/wx/dc.h
index 9d77e88e3e9c82ef9876ff7efae991da627f6165..eeeb907f6d05aaa5750f565ff48442cf73895ff7 100644 (file)
--- a/interface/wx/dc.h
+++ b/interface/wx/dc.h
@@ -380,7 +380,7 @@ public:
         character with the given index if it is != -1 and return the bounding
         rectangle if required.
     */
-    void DrawLabel(const wxString& text, const wxBitmap& image,
+    void DrawLabel(const wxString& text, const wxBitmap& bitmap,
                    const wxRect& rect,
                    int alignment = wxALIGN_LEFT | wxALIGN_TOP,
                    int indexAccel = -1, wxRect* rectBounding = NULL);
@@ -1562,6 +1562,14 @@ public:
     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.
     */
-    wxDCClipper(wxDC& dc, const wxRegion& r);
+    wxDCClipper(wxDC& dc, const wxRegion& region);
     wxDCClipper(wxDC& dc, const wxRect& rect);
     wxDCClipper(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h);
     //@}

diff --git a/interface/wx/dcps.h b/interface/wx/dcps.h
index b533506563aaf994b603f6838a669d0bf474dc9e..f98b7968dbb7bc4aabe90a2390020e1d19a553a8 100644 (file)
--- a/interface/wx/dcps.h
+++ b/interface/wx/dcps.h
@@ -19,22 +19,12 @@
 class wxPostScriptDC : public wxDC
 {
 public:
+    wxPostScriptDC();
+
     /**
         Constructs a PostScript printer device context from a wxPrintData object.
     */
     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;
 };