Regenerated FL docs; applied patch [ #511363 ] Dialogs no longer need wx.rc

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

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index c44beb9c53e1b9dd6b9811b937b934df147f840e..8c447ae4266e3bfad9dc04add64ea32a1b5af054 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -40,8 +40,6 @@ class wxDC;
 
 class wxDC : public wxDCBase
 {
 
 class wxDC : public wxDCBase
 {

-    DECLARE_ABSTRACT_CLASS(wxDC)
-

 public:
     wxDC();
     ~wxDC() { }
 public:
     wxDC();
     ~wxDC() { }


@@ -136,7 +134,6 @@ public:
 protected:
     // base class pure virtuals implemented here
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
 protected:
     // base class pure virtuals implemented here
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

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

     virtual void DoGetSizeMM(int* width, int* height) const;
 
 public:
     virtual void DoGetSizeMM(int* width, int* height) const;
 
 public:


@@ -150,7 +147,9 @@ public:
     bool         m_needComputeScaleX,
                  m_needComputeScaleY; // not yet used
 
     bool         m_needComputeScaleX,
                  m_needComputeScaleY; // not yet used
 

-    float        m_scaleFactor;  // wxPSDC wants to have this. Will disappear.
+    
+private:
+    DECLARE_ABSTRACT_CLASS(wxDC)

 };
 
 #endif // __GTKDCH__
 };
 
 #endif // __GTKDCH__