take const address objects in wxSocketClient::Connect() and wxSocketBase::SetLocal()

[wxWidgets.git] / include / wx / mgl / dc.h

diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h
index 8c6ae8549e3c151db861ff36edf047768b954098..02535965b788cafb6eaf66655d51bdb018eac1b5 100644 (file)
--- a/include/wx/mgl/dc.h
+++ b/include/wx/mgl/dc.h
@@ -18,7 +18,7 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDC;
+class WXDLLIMPEXP_FWD_CORE wxDC;

 
 //-----------------------------------------------------------------------------
 // constants
 
 //-----------------------------------------------------------------------------
 // constants


@@ -45,7 +45,7 @@ class MGLDevCtx;
 class MGLRegion;
 struct font_t;
 
 class MGLRegion;
 struct font_t;
 

-class WXDLLEXPORT wxDC : public wxDCBase
+class WXDLLIMPEXP_CORE wxDC : public wxDCBase

 {
     DECLARE_DYNAMIC_CLASS(wxDC)
 
 {
     DECLARE_DYNAMIC_CLASS(wxDC)
 


@@ -140,11 +140,9 @@ protected:
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
                         int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
                         int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 

-    // this is gnarly - we can't even call this function DoSetClippingRegion()
-    // because of virtual function hiding
-    virtual void DoSetClippingRegionAsRegion(const wxRegion& region);

     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
                                      wxCoord width, wxCoord height);
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
                                      wxCoord width, wxCoord height);

+    virtual void DoSetDeviceClippingRegion(const wxRegion& region);

 
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
 
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetSizeMM(int* width, int* height) const;