set eol-style

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

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 48503572df8d6585dc9438622d6c411d909cb0df..07e9a26851fc9e3091ae1e9df2701c1a3df0c698 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -10,15 +10,22 @@
 #ifndef __GTKDCH__
 #define __GTKDCH__
 
 #ifndef __GTKDCH__
 #define __GTKDCH__
 

+

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

-class WXDLLIMPEXP_CORE wxDC : public wxDCBase
+#if wxUSE_NEW_DC
+class WXDLLIMPEXP_CORE wxGTKImplDC : public wxDC
+#else
+#define wxGTKImplDC wxDC
+class WXDLLIMPEXP_CORE wxGTKImplDC : public wxDCBase
+#endif
+

 {
 public:
 {
 public:

-    wxDC();
-    virtual ~wxDC() { }
+    wxGTKImplDC();
+    virtual ~wxGTKImplDC() { }

 
 #if wxUSE_PALETTE
     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
 
 #if wxUSE_PALETTE
     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };


@@ -50,7 +57,7 @@ protected:
     virtual void DoGetSizeMM(int* width, int* height) const;
 
 private:
     virtual void DoGetSizeMM(int* width, int* height) const;
 
 private:

-    DECLARE_ABSTRACT_CLASS(wxDC)
+    DECLARE_ABSTRACT_CLASS(wxGTKImplDC)

 };
 
 // this must be defined when wxDC::Blit() honours the DC origian and needed to
 };
 
 // this must be defined when wxDC::Blit() honours the DC origian and needed to