projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add wxDataViewCtrl::ExpandAncestors() and call it from both EnsureVisible() and Select()
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
dcclient.h
diff --git
a/include/wx/gtk1/dcclient.h
b/include/wx/gtk1/dcclient.h
index 2168e181d7c6e87e0fdf4736e8095bef4f6ab377..b0e3f9e4385bdf914a19bdefb5a6c38974813577 100644
(file)
--- a/
include/wx/gtk1/dcclient.h
+++ b/
include/wx/gtk1/dcclient.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: dcclient.h
+// Name:
wx/gtk1/
dcclient.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-10,39
+10,35
@@
#ifndef __GTKDCCLIENTH__
#define __GTKDCCLIENTH__
#ifndef __GTKDCCLIENTH__
#define __GTKDCCLIENTH__
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/dc.h"
+#include "wx/gtk1/dc.h"
#include "wx/window.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
#include "wx/window.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class
wxWindowDC
;
-class
wxPaintDC
;
-class
wxClientDC
;
+class
WXDLLIMPEXP_FWD_CORE wxWindowDCImpl
;
+class
WXDLLIMPEXP_FWD_CORE wxPaintDCImpl
;
+class
WXDLLIMPEXP_FWD_CORE wxClientDCImpl
;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-// wxWindowDC
+// wxWindowDC
Impl
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-class
wxWindowDC : public wxDC
+class
WXDLLIMPEXP_CORE wxWindowDCImpl : public wxGTKDCImpl
{
public:
{
public:
- wxWindowDC
(
);
- wxWindowDC
( wxWindow *win
);
+ wxWindowDC
Impl(wxDC *owner
);
+ wxWindowDC
Impl(wxDC *owner, wxWindow *win
);
-
~wxWindowDC
();
+
virtual ~wxWindowDCImpl
();
- 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;
protected:
virtual void DoGetSize(int *width, int *height) const;
- virtual
void
DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE );
+ virtual
bool
DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE );
virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 );
virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 );
@@
-65,11
+61,11
@@
protected:
virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y );
virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,
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,
virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc,
- int logical_func = wxCOPY, bool useMask =
FALSE
);
+ 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,
virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );
virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
@@
-78,7
+74,7
@@
protected:
wxCoord *width, wxCoord *height,
wxCoord *descent = (wxCoord *) NULL,
wxCoord *externalLeading = (wxCoord *) NULL,
wxCoord *width, wxCoord *height,
wxCoord *descent = (wxCoord *) NULL,
wxCoord *externalLeading = (wxCoord *) NULL,
- wxFont *theFont = (wxFont *) NULL) const;
+
const
wxFont *theFont = (wxFont *) NULL) const;
public:
virtual wxCoord GetCharWidth() const;
public:
virtual wxCoord GetCharWidth() const;
@@
-98,16
+94,14
@@
public:
virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
virtual void DestroyClippingRegion();
virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
virtual void DestroyClippingRegion();
- virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion );
-
-#if wxUSE_SPLINES
- virtual void DoDrawSpline( wxList *points );
-#endif
+ virtual void DoSetDeviceClippingRegion( const wxRegion ®ion );
// Resolution in pixels per logical inch
virtual wxSize GetPPI() const;
virtual int GetDepth() const;
// Resolution in pixels per logical inch
virtual wxSize GetPPI() const;
virtual int GetDepth() const;
+ virtual GdkWindow* GetGDKWindow() const { return m_window; }
+
// implementation
// --------------
// implementation
// --------------
@@
-122,47
+116,46
@@
public:
wxWindow *m_owner;
wxRegion m_currentClippingRegion;
wxRegion m_paintClippingRegion;
wxWindow *m_owner;
wxRegion m_currentClippingRegion;
wxRegion m_paintClippingRegion;
-#ifdef __WXGTK20__
- PangoContext *m_context;
- PangoFontDescription *m_fontdesc;
-#endif
void SetUpDC();
void Destroy();
void SetUpDC();
void Destroy();
- void ComputeScaleAndOrigin();
+ v
irtual v
oid ComputeScaleAndOrigin();
GdkWindow *GetWindow() { return m_window; }
private:
GdkWindow *GetWindow() { return m_window; }
private:
- DECLARE_DYNAMIC_CLASS(wxWindowDC)
+ DECLARE_DYNAMIC_CLASS(wxWindowDC
Impl
)
};
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
-// wxClientDC
+// wxClientDC
Impl
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-class
wxClientDC : public wxWindowDC
+class
WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
{
public:
{
public:
- wxClientDC() { }
- wxClientDC( wxWindow *win );
+ wxClientDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { }
+ wxClientDCImpl(wxDC *owner, wxWindow *win);
+
+protected:
+ virtual void DoGetSize(int *width, int *height) const;
private:
private:
- DECLARE_DYNAMIC_CLASS(wxClientDC)
+ DECLARE_DYNAMIC_CLASS(wxClientDC
Impl
)
};
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
-// wxPaintDC
+// wxPaintDC
Impl
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-class
wxPaintDC : public wxClientDC
+class
WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
{
public:
{
public:
- wxPaintDC
(
) { }
- wxPaintDC
( wxWindow *win
);
+ wxPaintDC
Impl(wxDC *owner) : wxClientDCImpl(owner
) { }
+ wxPaintDC
Impl(wxDC *owner, wxWindow *win
);
private:
private:
- DECLARE_DYNAMIC_CLASS(wxPaintDC)
+ DECLARE_DYNAMIC_CLASS(wxPaintDC
Impl
)
};
#endif // __GTKDCCLIENTH__
};
#endif // __GTKDCCLIENTH__