projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed GlobalPtr to GlobalPtrLock
[wxWidgets.git]
/
include
/
wx
/
motif
/
dcclient.h
diff --git
a/include/wx/motif/dcclient.h
b/include/wx/motif/dcclient.h
index 52d6d9db6668af1fde398b9796c54072cd75fd26..fa04c08521adbb5202e8c1d98a983ce5bb141474 100644
(file)
--- a/
include/wx/motif/dcclient.h
+++ b/
include/wx/motif/dcclient.h
@@
-12,15
+12,15
@@
#ifndef _WX_DCCLIENT_H_
#define _WX_DCCLIENT_H_
#ifndef _WX_DCCLIENT_H_
#define _WX_DCCLIENT_H_
-#if defined(__GNUG__) && !defined(
__APPLE__
)
+#if defined(__GNUG__) && !defined(
NO_GCC_PRAGMA
)
#pragma interface "dcclient.h"
#endif
#include "wx/dc.h"
#pragma interface "dcclient.h"
#endif
#include "wx/dc.h"
-// ----------------------------------------------------------------------------
-
+// ----------------------------------------------------------------------------
// fwd declarations
// fwd declarations
-// ----------------------------------------------------------------------------
-
+// ----------------------------------------------------------------------------
class WXDLLEXPORT wxWindowDC;
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxWindowDC;
class WXDLLEXPORT wxWindow;
@@
-78,7
+78,7
@@
public:
virtual void DestroyClippingRegion();
// Helper function for setting clipping
virtual void DestroyClippingRegion();
// Helper function for setting clipping
- void SetDCClipping();
+ void SetDCClipping(
WXRegion region
);
// implementation from now on
// --------------------------
// implementation from now on
// --------------------------
@@
-93,8
+93,8
@@
protected:
// note that this function will call colour.SetPixel,
// and will do one of curCol = colour, curCol = wxWHITE, curCol = wxBLACK
// roundToWhite has an effect for monochrome display only
// note that this function will call colour.SetPixel,
// and will do one of curCol = colour, curCol = wxWHITE, curCol = wxBLACK
// roundToWhite has an effect for monochrome display only
- // if roundToWhite ==
TRUE
then the colour will be set to white unless
- // it is RGB 0x000000;if roundToWhite ==
FALSE
the colour wull be set to
+ // 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;
// black unless it id RGB 0xffffff
int CalculatePixel(wxColour& colour, wxColour& curCol,
bool roundToWhite) const;
@@
-129,7
+129,7
@@
protected:
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 rop = wxCOPY, bool useMask =
FALSE
, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+ int rop = wxCOPY, bool useMask =
false
, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
@@
-140,19
+140,25
@@
protected:
virtual void DoDrawPolygon(int n, wxPoint points[],
wxCoord xoffset, wxCoord yoffset,
int fillStyle = wxODDEVEN_RULE);
virtual void DoDrawPolygon(int n, wxPoint points[],
wxCoord xoffset, wxCoord yoffset,
int fillStyle = wxODDEVEN_RULE);
-
+
+ void DoGetSize( int *width, int *height ) const;
+
+ // common part of constructors
+ void Init();
+
WXGC m_gc;
WXGC m_gcBacking;
WXDisplay* m_display;
wxWindow* m_window;
WXGC m_gc;
WXGC m_gcBacking;
WXDisplay* m_display;
wxWindow* m_window;
- WXRegion m_currentRegion; // Current clipping region (incl. paint clip region)
- WXRegion m_userRegion; // User-defined clipping region
- WXPixmap m_pixmap; // Pixmap for drawing on
-
+ // Pixmap for drawing on
+ WXPixmap m_pixmap;
+ // Last clipping region set on th GC, this is the combination
+ // of paint clipping region and all user-defined clipping regions
+ WXRegion m_clipRegion;
+
// Not sure if we'll need all of these
int m_backgroundPixel;
wxColour m_currentColour;
// Not sure if we'll need all of these
int m_backgroundPixel;
wxColour m_currentColour;
- // int m_currentBkMode;
int m_currentPenWidth ;
int m_currentPenJoin ;
int m_currentPenCap ;
int m_currentPenWidth ;
int m_currentPenJoin ;
int m_currentPenCap ;