projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxDC::Set/GetLayoutDirection() and implemented it for wxMSW (patch from Tim...
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
dcclient.h
diff --git
a/include/wx/gtk1/dcclient.h
b/include/wx/gtk1/dcclient.h
index e23af8e1cd4a9e24142c89708c93cbe385a3980d..c1654ba42a5635435bf9aeb6dca4d806f0da4b2b 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,10
+10,6
@@
#ifndef __GTKDCCLIENTH__
#define __GTKDCCLIENTH__
#ifndef __GTKDCCLIENTH__
#define __GTKDCCLIENTH__
-#ifdef __GNUG__
-#pragma interface
-#endif
-
#include "wx/dc.h"
#include "wx/window.h"
#include "wx/dc.h"
#include "wx/window.h"
@@
-21,15
+17,15
@@
// classes
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class wxWindowDC;
-class wxPaintDC;
-class wxClientDC;
+class
WXDLLIMPEXP_CORE
wxWindowDC;
+class
WXDLLIMPEXP_CORE
wxPaintDC;
+class
WXDLLIMPEXP_CORE
wxClientDC;
//-----------------------------------------------------------------------------
// wxWindowDC
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxWindowDC
//-----------------------------------------------------------------------------
-class wxWindowDC : public wxDC
+class
WXDLLIMPEXP_CORE
wxWindowDC : public wxDC
{
public:
wxWindowDC();
{
public:
wxWindowDC();
@@
-37,12
+33,12
@@
public:
virtual ~wxWindowDC();
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;
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,
@@
-104,6
+100,8
@@
public:
virtual wxSize GetPPI() const;
virtual int GetDepth() const;
virtual wxSize GetPPI() const;
virtual int GetDepth() const;
+ virtual GdkWindow* GetGDKWindow() const { return m_window; }
+
// implementation
// --------------
// implementation
// --------------
@@
-118,14
+116,10
@@
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; }
GdkWindow *GetWindow() { return m_window; }
@@
-137,7
+131,7
@@
private:
// wxClientDC
//-----------------------------------------------------------------------------
// wxClientDC
//-----------------------------------------------------------------------------
-class wxClientDC : public wxWindowDC
+class
WXDLLIMPEXP_CORE
wxClientDC : public wxWindowDC
{
public:
wxClientDC() { }
{
public:
wxClientDC() { }
@@
-154,7
+148,7
@@
private:
// wxPaintDC
//-----------------------------------------------------------------------------
// wxPaintDC
//-----------------------------------------------------------------------------
-class wxPaintDC : public wxClientDC
+class
WXDLLIMPEXP_CORE
wxPaintDC : public wxClientDC
{
public:
wxPaintDC() { }
{
public:
wxPaintDC() { }