Implemented Chuck Messenger's naming and simplification improvements,

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

diff --git a/include/wx/stubs/dc.h b/include/wx/stubs/dc.h
index e9969358cfaf4a4088f992ee8db6026ca12979ce..596e26de9ad40fcc009b081ec2a47c07174eef1f 100644 (file)
--- a/include/wx/stubs/dc.h
+++ b/include/wx/stubs/dc.h
@@ -177,16 +177,16 @@ class WXDLLEXPORT wxDC: public wxObject
     virtual void Clear(void) = 0;
             
     virtual void SetFont( const wxFont &font ) = 0;
     virtual void Clear(void) = 0;
             
     virtual void SetFont( const wxFont &font ) = 0;

-    virtual wxFont *GetFont(void) const { return (wxFont*) &m_font; };
+    virtual wxFont& GetFont(void) const { return (wxFont&) m_font; };

     
     virtual void SetPen( const wxPen &pen ) = 0;
     
     virtual void SetPen( const wxPen &pen ) = 0;

-    virtual wxPen *GetPen(void) const { return (wxPen*) &m_pen; };
+    virtual wxPen& GetPen(void) const { return (wxPen&) m_pen; };

     
     virtual void SetBrush( const wxBrush &brush ) = 0;
     
     virtual void SetBrush( const wxBrush &brush ) = 0;

-    virtual wxBrush *GetBrush(void) const { return (wxBrush*) &m_brush; };
+    virtual wxBrush& GetBrush(void) const { return (wxBrush&) m_brush; };

 
     virtual void SetBackground( const wxBrush &brush ) = 0;
 
     virtual void SetBackground( const wxBrush &brush ) = 0;

-    virtual wxBrush *GetBackground(void) const { return (wxBrush*) &m_backgroundBrush; };
+    virtual wxBrush& GetBackground(void) const { return (wxBrush&) m_backgroundBrush; };

 
     virtual void SetLogicalFunction( int function ) = 0;
     virtual int GetLogicalFunction(void) const { return m_logicalFunction; };
 
     virtual void SetLogicalFunction( int function ) = 0;
     virtual int GetLogicalFunction(void) const { return m_logicalFunction; };


@@ -364,8 +364,6 @@ class WXDLLEXPORT wxDC: public wxObject
     
     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.
-    

     long         m_clipX1,m_clipY1,m_clipX2,m_clipY2;
     long         m_minX,m_maxX,m_minY,m_maxY;
 };
     long         m_clipX1,m_clipY1,m_clipX2,m_clipY2;
     long         m_minX,m_maxX,m_minY,m_maxY;
 };