X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2fc40b4786f7ae8c255ce1184441bd94d9554a0..d8c74d044b5acfedfbc15bf29bbfa4f4bc8f1bf7:/include/wx/palmos/dc.h diff --git a/include/wx/palmos/dc.h b/include/wx/palmos/dc.h index 0e02472e31..216a802431 100644 --- a/include/wx/palmos/dc.h +++ b/include/wx/palmos/dc.h @@ -43,7 +43,7 @@ public: // this is an ABC: use one of the derived classes to create a DC associated // with a window, screen, printer and so on -class WXDLLEXPORT wxPalmDCImpl: public wxDCImpl +class WXDLLIMPEXP_CORE wxPalmDCImpl: public wxDCImpl { public: wxPalmDCImpl(wxDC *owner, WXHDC hDC); @@ -225,11 +225,9 @@ public: int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); - // 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 DoSetDeviceClippingRegion(const wxRegion& region); virtual void DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const; @@ -265,9 +263,6 @@ protected: // common part of DoDrawText() and DoDrawRotatedText() void DrawAnyText(const wxString& text, wxCoord x, wxCoord y); - // common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion() - void SetClippingHrgn(WXHRGN hrgn); - // implementation of DoGetSize() for wxScreen/PrinterDC: this simply // returns the size of the entire device this DC is associated with // @@ -319,7 +314,7 @@ protected: // only/mainly) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDCTempImpl : public wxPalmDCImpl +class WXDLLIMPEXP_CORE wxDCTempImpl : public wxPalmDCImpl { public: // construct a temporary DC with the specified HDC and size (it should be @@ -355,7 +350,7 @@ private: DECLARE_NO_COPY_CLASS(wxDCTempImpl) }; -class WXDLLEXPORT wxDCTemp : public wxDC +class WXDLLIMPEXP_CORE wxDCTemp : public wxDC { public: wxDCTemp(WXHDC hdc, const wxSize& size = wxDefaultSize)