more __deref__ changes

6 files changed, 19 insertions, 1 deletions

diff --git a/lib/gui/eslider.cpp b/lib/gui/eslider.cpp
index df199c47..dd2aac9e 100644
--- a/lib/gui/eslider.cpp
+++ b/lib/gui/eslider.cpp
@@ -5,6 +5,11 @@ eSlider::eSlider(eWidget *parent)
 {
 }
 
+void eSlider::setPixmap(ePtr<gPixmap> &pixmap)
+{
+	setPixmap(pixmap.operator->());
+}
+
 void eSlider::setPixmap(gPixmap *pixmap)
 {
 	m_pixmap = pixmap;
diff --git a/lib/gui/eslider.h b/lib/gui/eslider.h
index 303977a2..c5440726 100644
--- a/lib/gui/eslider.h
+++ b/lib/gui/eslider.h
@@ -15,6 +15,7 @@ public:
 	void setBorderWidth(int pixel);
 	void setBorderColor(const gRGB &color);
 	void setPixmap(gPixmap *pixmap);
+	void setPixmap(ePtr<gPixmap> &pixmap);
 protected:
 	int event(int event, void *data=0, void *data2=0);
 private:
diff --git a/lib/gui/ewidgetdesktop.cpp b/lib/gui/ewidgetdesktop.cpp
index 4d0c0a9b..9e483083 100644
--- a/lib/gui/ewidgetdesktop.cpp
+++ b/lib/gui/ewidgetdesktop.cpp
@@ -287,6 +287,11 @@ void eWidgetDesktop::setRedrawTask(eMainloop &ml)
 		m_timer->start(0, 1);
 }
 
+void eWidgetDesktop::makeCompatiblePixmap(ePtr<gPixmap> &pm)
+{
+	makeCompatiblePixmap(*(pm.operator->()));
+}
+
 void eWidgetDesktop::makeCompatiblePixmap(gPixmap &pm)
 {
 	if (m_comp_mode != cmImmediate)
diff --git a/lib/gui/ewidgetdesktop.h b/lib/gui/ewidgetdesktop.h
index fb4b3b82..7237df96 100644
--- a/lib/gui/ewidgetdesktop.h
+++ b/lib/gui/ewidgetdesktop.h
@@ -54,7 +54,8 @@ public:
 	void setPalette(gPixmap &pm);
 	
 	void setRedrawTask(eMainloop &ml);
-	
+
+	void makeCompatiblePixmap(ePtr<gPixmap> &pm);
 	void makeCompatiblePixmap(gPixmap &pm);
 	
 	enum {
diff --git a/lib/gui/ewindowstyleskinned.cpp b/lib/gui/ewindowstyleskinned.cpp
index 03c3fb74..0b20c925 100644
--- a/lib/gui/ewindowstyleskinned.cpp
+++ b/lib/gui/ewindowstyleskinned.cpp
@@ -214,6 +214,11 @@ RESULT eWindowStyleSkinned::getFont(int what, ePtr<gFont> &fnt)
 	return 0;
 }
 
+void eWindowStyleSkinned::setPixmap(int bs, int bp, ePtr<gPixmap> &ptr)
+{
+	setPixmap(bs, bp, *(ptr.operator->()));
+}
+
 void eWindowStyleSkinned::setPixmap(int bs, int bp, gPixmap &pixmap)
 {
 	if ((bs >= bsMax) || (bs < 0))
diff --git a/lib/gui/ewindowstyleskinned.h b/lib/gui/ewindowstyleskinned.h
index 57c54a08..2a30f178 100644
--- a/lib/gui/ewindowstyleskinned.h
+++ b/lib/gui/ewindowstyleskinned.h
@@ -52,6 +52,7 @@ public:
 		bpiBottomRight =  8,
 	};
 	
+	void setPixmap(int bs, int bp, ePtr<gPixmap> &pixmap);
 	void setPixmap(int bs, int bp, gPixmap &pixmap);
 	
 	enum {