Interface fixes for Phoenix

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

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index e66316d56a7042ad28f27a1d43a14ac3349a7fbc..1634fdbcd286fecea80f2f40e40d901f65fc46c2 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -7,9 +7,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKDCH__
-#define __GTKDCH__
+#ifndef _WX_GTKDC_H_
+#define _WX_GTKDC_H_
 
+#include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
 // wxDC
@@ -22,7 +23,7 @@ public:
     virtual ~wxGTKDCImpl();
 
 #if wxUSE_PALETTE
-    void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
+    void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }
 #endif // wxUSE_PALETTE
 
     // Resolution in pixels per logical inch
@@ -35,12 +36,10 @@ public:
 
     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;
 
-private:
     DECLARE_ABSTRACT_CLASS(wxGTKDCImpl)
 };
 
@@ -51,4 +50,4 @@ private:
     #define wxHAS_WORKING_GTK_DC_BLIT
 #endif
 
-#endif // __GTKDCH__
+#endif // _WX_GTKDC_H_