projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep wxPalmOS buildable after changes in wxConvAuto.
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
dcclient.h
diff --git
a/include/wx/gtk1/dcclient.h
b/include/wx/gtk1/dcclient.h
index f91eae7dc9f51d18ee2102e76f8f8aec3db35629..94cdb1d83d324df949bea4779392ff4dfa9f54fc 100644
(file)
--- a/
include/wx/gtk1/dcclient.h
+++ b/
include/wx/gtk1/dcclient.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: dcclient.h
+// Name:
wx/gtk1/
dcclient.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-10,10
+10,6
@@
#ifndef __GTKDCCLIENTH__
#define __GTKDCCLIENTH__
#ifndef __GTKDCCLIENTH__
#define __GTKDCCLIENTH__
-#ifdef __GNUG__
-#pragma interface
-#endif
-
#include "wx/dc.h"
#include "wx/window.h"
#include "wx/dc.h"
#include "wx/window.h"
@@
-21,27
+17,28
@@
// classes
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class wxWindowDC;
-class wxPaintDC;
-class wxClientDC;
+class
WXDLLIMPEXP_CORE
wxWindowDC;
+class
WXDLLIMPEXP_CORE
wxPaintDC;
+class
WXDLLIMPEXP_CORE
wxClientDC;
//-----------------------------------------------------------------------------
// wxWindowDC
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxWindowDC
//-----------------------------------------------------------------------------
-class wxWindowDC : public wxDC
+class
WXDLLIMPEXP_CORE
wxWindowDC : public wxDC
{
public:
wxWindowDC();
wxWindowDC( wxWindow *win );
{
public:
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
+61,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
+75,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
+96,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
+114,10
@@
public:
wxWindow *m_owner;
wxRegion m_currentClippingRegion;
wxRegion m_paintClippingRegion;
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();
- void ComputeScaleAndOrigin();
+ v
irtual v
oid ComputeScaleAndOrigin();
GdkWindow *GetWindow() { return m_window; }
GdkWindow *GetWindow() { return m_window; }
@@
-135,31
+126,34
@@
private:
};
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
-// wx
Pai
ntDC
+// wx
Clie
ntDC
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-class
wxPai
ntDC : public wxWindowDC
+class
WXDLLIMPEXP_CORE wxClie
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
wxClientDC : public wxWindow
DC
+class
WXDLLIMPEXP_CORE wxPaintDC : 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__