set eol-style

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

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 94de61a1f32e12dc99de86bfe343a8e0a1328fb3..a0fb9d6c23b428d246a2f8dda6939b595780ca24 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -35,14 +35,17 @@ public:
     virtual void SetTextBackground( const wxColour &col );
 
     // implementation
     virtual void SetTextBackground( const wxColour &col );
 
     // implementation

-    virtual wxBitmap GetSelectedBitmap() const { return m_selected; }        
+    wxBitmap GetSelectedBitmap() const { return m_selected; }

     wxBitmap  m_selected;
 
 protected:
     void DoGetSize( int *width, int *height ) const;
     virtual void DoSelect(const wxBitmap& bitmap);
     wxBitmap  m_selected;
 
 protected:
     void DoGetSize( int *width, int *height ) const;
     virtual void DoSelect(const wxBitmap& bitmap);

-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
-    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
+    {
+        wxBitmap bmp = GetSelectedBitmap();
+        return subrect ? bmp.GetSubBitmap(*subrect) : bmp;
+    }

 
 private:
     void Init();
 
 private:
     void Init();