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

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

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index e66316d56a7042ad28f27a1d43a14ac3349a7fbc..2e067abc9580fd44d9b10887e478e842ccffd28e 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -7,9 +7,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKDCH__
-#define __GTKDCH__
+#ifndef _WX_GTKDC_H_
+#define _WX_GTKDC_H_

 
 

+#include "wx/dc.h"

 
 //-----------------------------------------------------------------------------
 // wxDC
 
 //-----------------------------------------------------------------------------
 // wxDC


@@ -35,12 +36,10 @@ public:
 
     virtual GdkWindow* GetGDKWindow() const { return NULL; }
 
 
     virtual GdkWindow* GetGDKWindow() const { return NULL; }
 

-protected:

     // base class pure virtuals implemented here
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSizeMM(int* width, int* height) const;
 
     // base class pure virtuals implemented here
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSizeMM(int* width, int* height) const;
 

-private:

     DECLARE_ABSTRACT_CLASS(wxGTKDCImpl)
 };
 
     DECLARE_ABSTRACT_CLASS(wxGTKDCImpl)
 };
 


@@ -51,4 +50,4 @@ private:
     #define wxHAS_WORKING_GTK_DC_BLIT
 #endif
 
     #define wxHAS_WORKING_GTK_DC_BLIT
 #endif
 

-#endif // __GTKDCH__
+#endif // _WX_GTKDC_H_