projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove EVT_STC_POSCHANGED as it's been deprecated in Scintilla for
[wxWidgets.git]
/
include
/
wx
/
gtk
/
dcclient.h
diff --git
a/include/wx/gtk/dcclient.h
b/include/wx/gtk/dcclient.h
index 15ebfa6b56efd0e0a63cb46dc2a20cb549b75231..fc7e52885e958f4432555176f60d074918fb9508 100644
(file)
--- a/
include/wx/gtk/dcclient.h
+++ b/
include/wx/gtk/dcclient.h
@@
-10,7
+10,7
@@
#ifndef __GTKDCCLIENTH__
#define __GTKDCCLIENTH__
#ifndef __GTKDCCLIENTH__
#define __GTKDCCLIENTH__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface
#endif
#pragma interface
#endif
@@
-35,14
+35,14
@@
public:
wxWindowDC();
wxWindowDC( wxWindow *win );
wxWindowDC();
wxWindowDC( wxWindow *win );
- ~wxWindowDC();
+
virtual
~wxWindowDC();
virtual bool CanDrawBitmap() const { return TRUE; }
virtual bool CanGetTextExtent() const { return TRUE; }
protected:
virtual void DoGetSize(int *width, int *height) const;
virtual bool CanDrawBitmap() const { return TRUE; }
virtual bool CanGetTextExtent() const { return TRUE; }
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 );
@@
-69,7
+69,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 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,
@@
-100,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;
@@
-122,8
+118,11
@@
public:
wxWindow *m_owner;
wxRegion m_currentClippingRegion;
wxRegion m_paintClippingRegion;
wxWindow *m_owner;
wxRegion m_currentClippingRegion;
wxRegion m_paintClippingRegion;
+
+ // PangoContext stuff for GTK 2.0
#ifdef __WXGTK20__
PangoContext *m_context;
#ifdef __WXGTK20__
PangoContext *m_context;
+ PangoLayout *m_layout;
PangoFontDescription *m_fontdesc;
#endif
PangoFontDescription *m_fontdesc;
#endif