projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added #if wxUSE_STACKWALKER. Fixes compilation of OS X shared libraries.
[wxWidgets.git]
/
include
/
wx
/
gtk
/
dcclient.h
diff --git
a/include/wx/gtk/dcclient.h
b/include/wx/gtk/dcclient.h
index f91eae7dc9f51d18ee2102e76f8f8aec3db35629..ad9d68325bc9f1c63e1be7455b999c96cafe37dc 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,13
+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
; }
+ virtual bool CanDrawBitmap() const { return
true
; }
+ virtual bool CanGetTextExtent() const { return
true
; }
-//protected:
- virtual void DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE );
+protected:
+ virtual void DoGetSize(int *width, int *height) const;
+ 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 );
@@
-64,11
+65,11
@@
public:
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,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;
@@
-119,14
+118,17
@@
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
void SetUpDC();
void Destroy();
PangoFontDescription *m_fontdesc;
#endif
void SetUpDC();
void Destroy();
- void ComputeScaleAndOrigin();
+ v
irtual v
oid ComputeScaleAndOrigin();
GdkWindow *GetWindow() { return m_window; }
GdkWindow *GetWindow() { return m_window; }
@@
-135,31
+137,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__