X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/925f7740663f38ed8296ddb247754a9d62152aea..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/motif/dcclient.h diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h index 5a00c3cd2f..69d2de39ce 100644 --- a/include/wx/motif/dcclient.h +++ b/include/wx/motif/dcclient.h @@ -18,8 +18,8 @@ // fwd declarations // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowDC; -class WXDLLEXPORT wxWindow; +class WXDLLIMPEXP_FWD_CORE wxWindowDC; +class WXDLLIMPEXP_FWD_CORE wxWindow; // Under Windows, wxClientDC, wxPaintDC and wxWindowDC are implemented // differently. On many platforms, however, they will be the same. @@ -36,7 +36,7 @@ public: wxWindowDC(); wxWindowDC( wxWindow *win ); - ~wxWindowDC(); + virtual ~wxWindowDC(); // TODO this function is Motif-only for now - should it go into base class? void Clear(const wxRect& rect); @@ -63,7 +63,7 @@ public: wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - wxFont *theFont = NULL) const; + const wxFont *theFont = NULL) const; virtual bool CanDrawBitmap() const; virtual bool CanGetTextExtent() const; @@ -92,11 +92,11 @@ protected: // if roundToWhite == true then the colour will be set to white unless // it is RGB 0x000000;if roundToWhite == true the colour wull be set to // black unless it id RGB 0xffffff - int CalculatePixel(wxColour& colour, wxColour& curCol, - bool roundToWhite) const; + WXPixel CalculatePixel(wxColour& colour, wxColour& curCol, + bool roundToWhite) const; // sets the foreground pixel taking into account the // currently selected logical operation - void SetForegroundPixelWithLogicalFunction(int pixel); + void SetForegroundPixelWithLogicalFunction(WXPixel pixel); virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE); @@ -153,7 +153,7 @@ protected: WXRegion m_clipRegion; // Not sure if we'll need all of these - int m_backgroundPixel; + WXPixel m_backgroundPixel; wxColour m_currentColour; int m_currentPenWidth ; int m_currentPenJoin ; @@ -174,7 +174,7 @@ public: wxPaintDC() { } wxPaintDC(wxWindow* win); - ~wxPaintDC(); + virtual ~wxPaintDC(); }; class WXDLLEXPORT wxClientDC: public wxWindowDC