X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..c493691d6249650c0366fd9aaaca8572e3ff3edd:/include/wx/gtk1/dcclient.h diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h index 2faee6d873..70b7d9b38f 100644 --- a/include/wx/gtk1/dcclient.h +++ b/include/wx/gtk1/dcclient.h @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKDCCLIENTH__ @@ -21,15 +21,15 @@ // classes //----------------------------------------------------------------------------- -class wxWindowDC; -class wxPaintDC; -class wxClientDC; +class WXDLLIMPEXP_CORE wxWindowDC; +class WXDLLIMPEXP_CORE wxPaintDC; +class WXDLLIMPEXP_CORE wxClientDC; //----------------------------------------------------------------------------- // wxWindowDC //----------------------------------------------------------------------------- -class wxWindowDC : public wxDC +class WXDLLIMPEXP_CORE wxWindowDC : public wxDC { public: wxWindowDC(); @@ -37,8 +37,8 @@ public: virtual ~wxWindowDC(); - virtual bool CanDrawBitmap() const { return TRUE; } - virtual bool CanGetTextExtent() const { return TRUE; } + virtual bool CanDrawBitmap() const { return true; } + virtual bool CanGetTextExtent() const { return true; } protected: virtual void DoGetSize(int *width, int *height) const; @@ -65,11 +65,11 @@ protected: virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ); virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y, - bool useMask = FALSE ); + bool useMask = false ); virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int logical_func = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ); + int logical_func = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ); virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y ); virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, @@ -118,7 +118,7 @@ public: wxWindow *m_owner; wxRegion m_currentClippingRegion; wxRegion m_paintClippingRegion; - + // PangoContext stuff for GTK 2.0 #ifdef __WXGTK20__ PangoContext *m_context; @@ -128,7 +128,7 @@ public: void SetUpDC(); void Destroy(); - void ComputeScaleAndOrigin(); + virtual void ComputeScaleAndOrigin(); GdkWindow *GetWindow() { return m_window; } @@ -140,7 +140,7 @@ private: // wxClientDC //----------------------------------------------------------------------------- -class wxClientDC : public wxWindowDC +class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC { public: wxClientDC() { } @@ -157,7 +157,7 @@ private: // wxPaintDC //----------------------------------------------------------------------------- -class wxPaintDC : public wxClientDC +class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC { public: wxPaintDC() { }