projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't use WXDLLEXPORT with nested template classes: this doesn't work
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
dcclient.h
diff --git
a/include/wx/gtk1/dcclient.h
b/include/wx/gtk1/dcclient.h
index 752fd0946249c9e5cc6415c795699625c7381efe..ad9d68325bc9f1c63e1be7455b999c96cafe37dc 100644
(file)
--- a/
include/wx/gtk1/dcclient.h
+++ b/
include/wx/gtk1/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
; }
+ 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
+65,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,
@@
-118,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; }
@@
-140,7
+143,7
@@
private:
class wxClientDC : public wxWindowDC
{
public:
class wxClientDC : public wxWindowDC
{
public:
- wxClientDC()
;
+ wxClientDC()
{ }
wxClientDC( wxWindow *win );
protected:
wxClientDC( wxWindow *win );
protected: