added linear and concentric gradient fill functions (modified/fixed patch from Ryan...

[wxWidgets.git] / include / wx / gtk / dcclient.h

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index ad9d68325bc9f1c63e1be7455b999c96cafe37dc..2555d5b38836a0b34c2227518c6385b63d2df864 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -10,10 +10,6 @@
 #ifndef __GTKDCCLIENTH__
 #define __GTKDCCLIENTH__
 
 #ifndef __GTKDCCLIENTH__
 #define __GTKDCCLIENTH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

 #include "wx/dc.h"
 #include "wx/window.h"
 
 #include "wx/dc.h"
 #include "wx/window.h"
 


@@ -21,15 +17,15 @@
 // 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();
 {
 public:
     wxWindowDC();


@@ -79,6 +75,8 @@ protected:
                                 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;

+    virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
+    virtual void DoSetClippingRegionAsRegion( const wxRegion &region );

 
 public:
     virtual wxCoord GetCharWidth() const;
 
 public:
     virtual wxCoord GetCharWidth() const;


@@ -96,9 +94,7 @@ public:
     virtual void SetBackgroundMode( int mode );
     virtual void SetPalette( const wxPalette& palette );
 
     virtual void SetBackgroundMode( int mode );
     virtual void SetPalette( const wxPalette& palette );
 

-    virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );

     virtual void DestroyClippingRegion();
     virtual void DestroyClippingRegion();

-    virtual void DoSetClippingRegionAsRegion( const wxRegion &region  );

 
     // Resolution in pixels per logical inch
     virtual wxSize GetPPI() const;
 
     // Resolution in pixels per logical inch
     virtual wxSize GetPPI() const;


@@ -120,11 +116,9 @@ public:
     wxRegion      m_paintClippingRegion;
 
     // PangoContext stuff for GTK 2.0
     wxRegion      m_paintClippingRegion;
 
     // PangoContext stuff for GTK 2.0

-#ifdef __WXGTK20__

     PangoContext *m_context;
     PangoLayout *m_layout;
     PangoFontDescription *m_fontdesc;
     PangoContext *m_context;
     PangoLayout *m_layout;
     PangoFontDescription *m_fontdesc;

-#endif

 
     void SetUpDC();
     void Destroy();
 
     void SetUpDC();
     void Destroy();


@@ -140,7 +134,7 @@ private:
 // wxClientDC
 //-----------------------------------------------------------------------------
 
 // wxClientDC
 //-----------------------------------------------------------------------------
 

-class wxClientDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC

 {
 public:
     wxClientDC() { }
 {
 public:
     wxClientDC() { }


@@ -157,7 +151,7 @@ private:
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
 // wxPaintDC
 //-----------------------------------------------------------------------------
 

-class wxPaintDC : public wxClientDC
+class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC

 {
 public:
     wxPaintDC() { }
 {
 public:
     wxPaintDC() { }