added WX_ASSERT_MESSAGE macro to simply using CPPUNIT_ASSERT_MESSAGE with wxString...

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

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 41cc073dacae52df1da799993cf20c8e5ecc1277..29e35429a5382665f43cd3d9a32f68a9008bc71f 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -7,10 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKDCCLIENTH__
-#define __GTKDCCLIENTH__
+#ifndef _WX_GTKDCCLIENT_H_
+#define _WX_GTKDCCLIENT_H_

 
 

-#include "wx/dc.h"

 #include "wx/gtk/dc.h"
 #include "wx/dcclient.h"
 #include "wx/region.h"
 #include "wx/gtk/dc.h"
 #include "wx/dcclient.h"
 #include "wx/region.h"


@@ -32,7 +31,6 @@ public:
     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;
     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 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;


@@ -75,8 +73,6 @@ protected:
     virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     virtual void DoSetClippingRegionAsRegion( const wxRegion &region );
 
     virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     virtual void DoSetClippingRegionAsRegion( const wxRegion &region );
 

-
-public:

     virtual wxCoord GetCharWidth() const;
     virtual wxCoord GetCharHeight() const;
 
     virtual wxCoord GetCharWidth() const;
     virtual wxCoord GetCharHeight() const;
 


@@ -129,6 +125,8 @@ public:
     virtual GdkWindow *GetGDKWindow() const { return m_gdkwindow; }
 
 private:
     virtual GdkWindow *GetGDKWindow() const { return m_gdkwindow; }
 
 private:

+    void DrawingSetup(GdkGC*& gc, bool& originChanged);
+

     DECLARE_ABSTRACT_CLASS(wxWindowDCImpl)
 };
 
     DECLARE_ABSTRACT_CLASS(wxWindowDCImpl)
 };
 


@@ -142,10 +140,8 @@ public:
     wxClientDCImpl( wxDC *owner );
     wxClientDCImpl( wxDC *owner, wxWindow *win );
 
     wxClientDCImpl( wxDC *owner );
     wxClientDCImpl( wxDC *owner, wxWindow *win );
 

-protected:

     virtual void DoGetSize(int *width, int *height) const;
 
     virtual void DoGetSize(int *width, int *height) const;
 

-private:

     DECLARE_ABSTRACT_CLASS(wxClientDCImpl)
 };
 
     DECLARE_ABSTRACT_CLASS(wxClientDCImpl)
 };
 


@@ -159,10 +155,7 @@ public:
     wxPaintDCImpl( wxDC *owner );
     wxPaintDCImpl( wxDC *owner, wxWindow *win );
 
     wxPaintDCImpl( wxDC *owner );
     wxPaintDCImpl( wxDC *owner, wxWindow *win );
 

-private:

     DECLARE_ABSTRACT_CLASS(wxPaintDCImpl)
 };
 
     DECLARE_ABSTRACT_CLASS(wxPaintDCImpl)
 };
 

-#endif
-    // __GTKDCCLIENTH__
-
+#endif // _WX_GTKDCCLIENT_H_