X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81f6ea4a29eb815dbed0adea369efdc8fece0269..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/motif/dcclient.h diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h index 6d088a05c6..dccf727b89 100644 --- a/include/wx/motif/dcclient.h +++ b/include/wx/motif/dcclient.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcclient.h +// Name: wx/motif/dcclient.h // Purpose: wxClientDC, wxPaintDC and wxWindowDC classes // Author: Julian Smart // Modified by: @@ -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); @@ -82,7 +82,7 @@ public: WXGC GetGC() const { return m_gc; } WXGC GetBackingGC() const { return m_gcBacking; } WXDisplay* GetDisplay() const { return m_display; } - bool GetAutoSetting() const { return m_autoSetting; } + bool GetAutoSetting() const { return (m_autoSetting != 0); } // See comment in dcclient.cpp void SetAutoSetting(bool flag) { m_autoSetting = flag; } protected: @@ -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 @@ -187,4 +187,3 @@ public: }; #endif // _WX_DCCLIENT_H_ -