Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/dcgraph.h b/interface/wx/dcgraph.h
index e4d4459bfca1183cf3cf8e1c223b75735bd7e2e2..5d086485c1509eafaad21b1448e24d107a8a7c9f 100644 (file)
--- a/interface/wx/dcgraph.h
+++ b/interface/wx/dcgraph.h
@@ -2,13 +2,12 @@
 // Name:        dcgraph.h
 // Purpose:     interface of wxGCDC
 // Author:      wxWidgets team
 // Name:        dcgraph.h
 // Purpose:     interface of wxGCDC
 // Author:      wxWidgets team

-// RCS-ID:      $Id: $
-// Licence:     wxWindows license
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxGCDC
 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxGCDC

-    @wxheader{dcgraph.h}

 
     wxGCDC is a device context that draws on a wxGraphicsContext.
 
 
     wxGCDC is a device context that draws on a wxGraphicsContext.
 


@@ -25,20 +24,31 @@ public:
        Constructs a wxGCDC from a wxWindowDC.
     */
     wxGCDC( const wxWindowDC& dc );
        Constructs a wxGCDC from a wxWindowDC.
     */
     wxGCDC( const wxWindowDC& dc );

-    
+

     /**
        Constructs a wxGCDC from a wxMemoryDC.
     */
     wxGCDC( const wxMemoryDC& dc );
     /**
        Constructs a wxGCDC from a wxMemoryDC.
     */
     wxGCDC( const wxMemoryDC& dc );

-    
+

     /**
        Constructs a wxGCDC from a wxPrinterDC.
     */
     wxGCDC( const wxPrinterDC& dc );
     /**
        Constructs a wxGCDC from a wxPrinterDC.
     */
     wxGCDC( const wxPrinterDC& dc );

- 
+
+    /**
+       Constructs a wxGCDC from a wxEnhMetaFileDC.
+
+       This constructor is only available in wxMSW port and when @c
+       wxUSE_ENH_METAFILE build option is enabled, i.e. when wxEnhMetaFileDC
+       class itself is available.
+
+       @since 2.9.3
+    */
+    wxGCDC( const wxEnhMetaFileDC& dc );
+

     /**
        Retrieves associated wxGraphicsContext
     */
     /**
        Retrieves associated wxGraphicsContext
     */

-    wxGraphicsContext* GetGraphicsContext();
+    wxGraphicsContext* GetGraphicsContext() const;

 };
 
 };