projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unicodification of wxTextFile
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
dcclient.h
diff --git
a/include/wx/gtk1/dcclient.h
b/include/wx/gtk1/dcclient.h
index acc3896336f08abe1b31f41b686d13bab9b99771..77331532da0b56aed7aef283c1bc059fe882a986 100644
(file)
--- a/
include/wx/gtk1/dcclient.h
+++ b/
include/wx/gtk1/dcclient.h
@@
-35,12
+35,13
@@
public:
wxWindowDC();
wxWindowDC( wxWindow *win );
wxWindowDC();
wxWindowDC( wxWindow *win );
- ~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:
+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 DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
virtual void DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE );
virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
@@
-68,7
+69,7
@@
public:
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,6
+79,8
@@
public:
wxCoord *descent = (wxCoord *) NULL,
wxCoord *externalLeading = (wxCoord *) NULL,
wxFont *theFont = (wxFont *) NULL) const;
wxCoord *descent = (wxCoord *) NULL,
wxCoord *externalLeading = (wxCoord *) NULL,
wxFont *theFont = (wxFont *) NULL) const;
+
+public:
virtual wxCoord GetCharWidth() const;
virtual wxCoord GetCharHeight() const;
virtual wxCoord GetCharWidth() const;
virtual wxCoord GetCharHeight() const;
@@
-97,10
+100,6
@@
public:
virtual void DestroyClippingRegion();
virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion );
virtual void DestroyClippingRegion();
virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion );
-#if wxUSE_SPLINES
- virtual void DoDrawSpline( wxList *points );
-#endif
-
// 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;
@@
-115,7
+114,14
@@
public:
GdkGC *m_bgGC;
GdkColormap *m_cmap;
bool m_isMemDC;
GdkGC *m_bgGC;
GdkColormap *m_cmap;
bool m_isMemDC;
+ bool m_isScreenDC;
wxWindow *m_owner;
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();
@@
-128,31
+134,34
@@
private:
};
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
-// wx
Pai
ntDC
+// wx
Clie
ntDC
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-class wx
Pai
ntDC : public wxWindowDC
+class wx
Clie
ntDC : public wxWindowDC
{
public:
{
public:
- wxPaintDC();
- wxPaintDC( wxWindow *win );
+ wxClientDC() { }
+ wxClientDC( wxWindow *win );
+
+protected:
+ virtual void DoGetSize(int *width, int *height) const;
private:
private:
- DECLARE_DYNAMIC_CLASS(wx
Pai
ntDC)
+ DECLARE_DYNAMIC_CLASS(wx
Clie
ntDC)
};
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
-// wx
Clie
ntDC
+// wx
Pai
ntDC
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-class wx
ClientDC : public wxWindow
DC
+class wx
PaintDC : public wxClient
DC
{
public:
{
public:
- wx
ClientDC();
- wx
Clie
ntDC( wxWindow *win );
+ wx
PaintDC() { }
+ wx
Pai
ntDC( wxWindow *win );
private:
private:
- DECLARE_DYNAMIC_CLASS(wx
Clie
ntDC)
+ DECLARE_DYNAMIC_CLASS(wx
Pai
ntDC)
};
#endif // __GTKDCCLIENTH__
};
#endif // __GTKDCCLIENTH__