Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / dcps.h

diff --git a/interface/wx/dcps.h b/interface/wx/dcps.h
index f1db03d9da9b9e690c66157323d92e05b4eb3c29..b533506563aaf994b603f6838a669d0bf474dc9e 100644 (file)
--- a/interface/wx/dcps.h
+++ b/interface/wx/dcps.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxPostScriptDC
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxPostScriptDC
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -20,38 +20,21 @@ class wxPostScriptDC : public wxDC
 {
 public:
     /**
 {
 public:
     /**

-        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);

-    /**
-        Constructor. @a output is an optional file for printing to, and if
-        @a interactive is @true a dialog box will be displayed for adjusting
-        various parameters. @a parent is the parent of the printer dialog box.
-
-        Use the wxDC::Ok() member to test whether the constructor was
-        successful in creating a usable device context.
-
-        See wxPrintData for various functions to set and get PostScript
-        printing settings.
-
-        @deprecated This constructor is deprecated.
-    */
-    wxPostScriptDC(const wxString& output,
-                   bool interactive = true,
-                   wxWindow* parent);

 
     /**
         Return resolution used in PostScript output.
 
         @see SetResolution()
     */
 
     /**
         Return resolution used in PostScript output.
 
         @see SetResolution()
     */

-    static int GetResolution();
+    virtual int GetResolution() const;

 
     /**
         Set resolution (in pixels per inch) that will be used in PostScript
         output. Default is 720ppi.
     */
 
     /**
         Set resolution (in pixels per inch) that will be used in PostScript
         output. Default is 720ppi.
     */

-    static void SetResolution(int ppi);
+    virtual wxRect GetPaperRect() const;

 };
 
 };