M src/Slit.cc → src/Slit.cc

@@ -310,7 +310,7 @@
 	Pixmap tmp = frame.pixmap;
 	BImageControl *image_ctrl = screen->getImageControl();
 	BTexture *texture = &(screen->getToolbarStyle()->toolbar);
-	if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
+	if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
 		frame.pixmap = None;
 		XSetWindowBackground(display, frame.window,
 			 texture->getColor()->getPixel());

M src/Tab.cc → src/Tab.cc

@@ -165,9 +165,9 @@ BImageControl *image_ctrl = m_win->getScreen()->getImageControl();
 	Pixmap tmp = m_focus_pm;
 	BTexture *texture = &(m_win->getScreen()->getWindowStyle()->tab.l_focus);
 
- 	if (texture->getTexture() & BImage_ParentRelative ) {
+ 	if (texture->getTexture() & BImage::PARENTRELATIVE ) {
 		BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_focus);
-		if (pt->getTexture() == (BImage_Flat | BImage_Solid)) {
+		if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) {
   		  m_focus_pm = None;
 	    m_focus_pixel = pt->getColor()->getPixel();
   	} else
@@ -176,7 +176,7 @@ image_ctrl->renderImage(m_size_w, m_size_h, pt);
   	if (tmp) image_ctrl->removeImage(tmp);
 		
 	} else {
-		if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
+		if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
   		  m_focus_pm = None;
 	    m_focus_pixel = texture->getColor()->getPixel();
   	} else
@@ -188,16 +188,16 @@
 	tmp = m_unfocus_pm;
 	texture = &(m_win->getScreen()->getWindowStyle()->tab.l_unfocus);
   
-	if (texture->getTexture() & BImage_ParentRelative ) {
+	if (texture->getTexture() & BImage::PARENTRELATIVE ) {
 		BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_unfocus);
-		if (pt->getTexture() == (BImage_Flat | BImage_Solid)) {
+		if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) {
 			m_unfocus_pm = None;
 			m_unfocus_pixel = pt->getColor()->getPixel();
   		} else
 			m_unfocus_pm =
 			image_ctrl->renderImage(m_size_w, m_size_h, pt);
 	} else {
-		if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
+		if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
 			m_unfocus_pm = None;
 			m_unfocus_pixel = texture->getColor()->getPixel();
   		} else

M src/Theme.cc → src/Theme.cc

@@ -766,9 +766,9 @@ if (XrmGetResource(m_database, rname, rclass, &value_type,
 				 &value))
 		m_imagecontrol->parseTexture(texture, value.addr);
 	else
-		texture->setTexture(BImage_Solid | BImage_Flat);
+		texture->setTexture(BImage::SOLID | BImage::FLAT);
 
-	if (texture->getTexture() & BImage_Solid) {
+	if (texture->getTexture() & BImage::SOLID) {
 		int clen = strlen(rclass) + 32, nlen = strlen(rname) + 32;
 
 		char *colorclass = new char[clen], *colorname = new char[nlen];
@@ -792,7 +792,7 @@ delete [] colorclass;
 		delete [] colorname;
 
 		if ((! texture->getColor()->isAllocated()) ||
-				(texture->getTexture() & BImage_Flat))
+				(texture->getTexture() & BImage::FLAT))
 			return retval;
 
 		XColor xcol;
@@ -829,7 +829,7 @@ if (! XAllocColor(m_display, m_colormap, &xcol))
 			xcol.pixel = 0;
 
 		texture->getLoColor()->setPixel(xcol.pixel);
-	} else if (texture->getTexture() & BImage_Gradient) {
+	} else if (texture->getTexture() & BImage::GRADIENT) {
 		int clen = strlen(rclass) + 10, nlen = strlen(rname) + 10;
 
 		char *colorclass = new char[clen], *colorname = new char[nlen],

M src/Toolbar.cc → src/Toolbar.cc

@@ -391,7 +391,7 @@ frame.label_h);
 
 	Pixmap tmp = frame.base;
 	BTexture *texture = &(screen->getToolbarStyle()->toolbar);
-	if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
+	if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
 		frame.base = None;
 		XSetWindowBackground(display, frame.window,
 			 texture->getColor()->getPixel());
@@ -404,7 +404,7 @@ if (tmp) image_ctrl->removeImage(tmp);
 
 	tmp = frame.label;
 	texture = &(screen->getToolbarStyle()->window);
-	if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
+	if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
 		frame.label = None;
 		XSetWindowBackground(display, frame.window_label,
 			 texture->getColor()->getPixel());
@@ -417,7 +417,7 @@ if (tmp) image_ctrl->removeImage(tmp);
 
 	tmp = frame.wlabel;
 	texture = &(screen->getToolbarStyle()->label);
-	if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
+	if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
 		frame.wlabel = None;
 		XSetWindowBackground(display, frame.workspace_label,
 			 texture->getColor()->getPixel());
@@ -430,7 +430,7 @@ if (tmp) image_ctrl->removeImage(tmp);
 
 	tmp = frame.clk;
 	texture = &(screen->getToolbarStyle()->clock);
-	if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
+	if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
 		frame.clk = None;
 		XSetWindowBackground(display, frame.clock,
 			 texture->getColor()->getPixel());
@@ -443,7 +443,7 @@ if (tmp) image_ctrl->removeImage(tmp);
 
 	tmp = frame.button;
 	texture = &(screen->getToolbarStyle()->button);
-	if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
+	if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
 		frame.button = None;
 
 		frame.button_pixel = texture->getColor()->getPixel();
@@ -464,7 +464,7 @@ if (tmp) image_ctrl->removeImage(tmp);
 
 	tmp = frame.pbutton;
 	texture = &(screen->getToolbarStyle()->pressed);
-	if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
+	if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
 		frame.pbutton = None;
 		frame.pbutton_pixel = texture->getColor()->getPixel();
 	} else