X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fgui%2Fewindowstyleskinned.h;h=b74f4623ea2393088aba430caca13ad7064d40d0;hb=808ffb53b149740f29291956d51b77a0a56a23c5;hp=17988f65192632514fba666b00d6d801d56534c1;hpb=ed5ecff4f6aaccb0b3bfaeedd9ee1714ff054b1e;p=vuplus_dvbapp

diff --git a/lib/gui/ewindowstyleskinned.h b/lib/gui/ewindowstyleskinned.h
index 17988f6..b74f462 100644
--- a/lib/gui/ewindowstyleskinned.h
+++ b/lib/gui/ewindowstyleskinned.h
@@ -8,12 +8,14 @@ class eWindowStyleSkinned: public eWindowStyle
 	DECLARE_REF(eWindowStyleSkinned);
 public:
 	eWindowStyleSkinned();
+#ifndef SWIG
 	void handleNewSize(eWindow *wnd, eSize &size, eSize &offset);
 	void paintWindowDecoration(eWindow *wnd, gPainter &painter, const std::string &title);
 	void paintBackground(gPainter &painter, const ePoint &offset, const eSize &size);
-	void setStyle(gPainter &painter, int what);
 	void drawFrame(gPainter &painter, const eRect &frame, int what);
 	RESULT getFont(int what, ePtr<gFont> &font);
+#endif
+	void setStyle(gPainter &painter, int what);
 	
 	enum {
 		bsWindow,
@@ -50,6 +52,7 @@ public:
 		bpiBottomRight =  8,
 	};
 	
+	void setPixmap(int bs, int bp, ePtr<gPixmap> &pixmap);
 	void setPixmap(int bs, int bp, gPixmap &pixmap);
 	
 	enum {
@@ -61,6 +64,8 @@ public:
 		colListboxSelectedForeground,
 		colListboxMarkedBackground,
 		colListboxMarkedForeground,
+		colListboxMarkedAndSelectedBackground,
+		colListboxMarkedAndSelectedForeground,
 		
 		colWindowTitleForeground,
 		colWindowTitleBackground,
@@ -77,6 +82,7 @@ private:
 	{
 		ePtr<gPixmap> m_pixmap[9];
 		int m_border_top, m_border_left, m_border_right, m_border_bottom;
+		borderSet() { m_border_top = m_border_left = m_border_right = m_border_bottom = 0; }
 	};
 	
 	borderSet m_border[bsMax];