fixed new image loading

author: fluxgen <fluxgen> 2003-08-22 21:35:40 (GMT)
committer: fluxgen <fluxgen> 2003-08-22 21:35:40 (GMT)
commit: dc3f13d2fc3e731e8929ec782cad1c1e2191802e (patch)
tree: 569639abb07294799706568ba4585a7577d6fb94 /src/WinButton.cc
parent: 834645f54563fc9a73a845e83ad687700ffecee1 (diff)
download: fluxbox-dc3f13d2fc3e731e8929ec782cad1c1e2191802e.zip
fluxbox-dc3f13d2fc3e731e8929ec782cad1c1e2191802e.tar.bz2
1 files changed, 35 insertions, 35 deletions
diff --git a/src/WinButton.cc b/src/WinButton.cc
index 01684fb..2534296 100644
--- a/src/WinButton.cc
+++ b/src/WinButton.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
-/// $Id: WinButton.cc,v 1.9 2003/08/22 15:04:18 fluxgen Exp $
+/// $Id: WinButton.cc,v 1.10 2003/08/22 21:33:13 fluxgen Exp $
 #include "WinButton.hh"
 #include "App.hh"
@@ -52,23 +52,23 @@ void WinButton::drawType() {
    switch (m_type) {
    case MAXIMIZE:
-        if (m_theme.maximizePixmap().pixmap.drawable() != 0) {
+        if (m_theme.maximizePixmap().pixmap().drawable() != 0) {
            if (pressed()) { 
                FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                    maximizePressedPixmap().
-                                                    pixmap.drawable());
+                                                    pixmap().drawable());
-            } else if (m_theme.maximizePixmap().pixmap.drawable()) {
+            } else if (m_theme.maximizePixmap().pixmap().drawable()) {
                // check focus 
                if (!m_listen_to.isFocused() && 
-                    m_theme.maximizeUnfocusPixmap().pixmap.drawable() != 0) {
+                    m_theme.maximizeUnfocusPixmap().pixmap().drawable() != 0) {
                    // not focused
                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                        maximizeUnfocusPixmap().
-                                                        pixmap.drawable());
+                                                        pixmap().drawable());
                } else { // focused
                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                        maximizePixmap().
-                                                        pixmap.drawable());
+                                                        pixmap().drawable());
                }
            }
            
@@ -84,23 +84,23 @@ void WinButton::drawType() {
        }
        break;
    case MINIMIZE:
-        if (m_theme.iconifyPixmap().pixmap.drawable() != 0) {
+        if (m_theme.iconifyPixmap().pixmap().drawable() != 0) {
            if (pressed()) { 
                FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                    iconifyPressedPixmap().
-                                                    pixmap.drawable());
+                                                    pixmap().drawable());
-            } else if (m_theme.iconifyPixmap().pixmap.drawable()){
+            } else if (m_theme.iconifyPixmap().pixmap().drawable()){
                // check focus 
                if (!m_listen_to.isFocused() && 
-                    m_theme.iconifyUnfocusPixmap().pixmap.drawable() != 0) {
+                    m_theme.iconifyUnfocusPixmap().pixmap().drawable() != 0) {
                    // not focused
                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                        iconifyUnfocusPixmap().
-                                                        pixmap.drawable());
+                                                        pixmap().drawable());
                } else { // focused
                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                        iconifyPixmap().
-                                                        pixmap.drawable());
+                                                        pixmap().drawable());
                }
            }
            
@@ -114,41 +114,41 @@ void WinButton::drawType() {
        }
        break;
    case STICK:
-        if (m_theme.stickPixmap().pixmap.drawable() != 0) {
+        if (m_theme.stickPixmap().pixmap().drawable() != 0) {
            if (m_listen_to.isStuck() && 
-                m_theme.stuckPixmap().pixmap.drawable() &&
+                m_theme.stuckPixmap().pixmap().drawable() &&
                ! pressed()) { // we're using the same pixmap for pressed as in not stuck
                // check focus 
                if (!m_listen_to.isFocused() && 
-                    m_theme.stuckUnfocusPixmap().pixmap.drawable() != 0) {
+                    m_theme.stuckUnfocusPixmap().pixmap().drawable() != 0) {
                    // not focused
                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                        stuckUnfocusPixmap().
-                                                        pixmap.drawable());
+                                                        pixmap().drawable());
                } else { // focused
                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                        stuckPixmap().
-                                                        pixmap.drawable());
+                                                        pixmap().drawable());
                }
            } else { // not stuck
                if (pressed()) { 
                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                        stickPressedPixmap().
-                                                        pixmap.drawable());
+                                                        pixmap().drawable());
-                } else if (m_theme.stickPixmap().pixmap.drawable()) {
+                } else if (m_theme.stickPixmap().pixmap().drawable()) {
                    // check focus 
                    if (!m_listen_to.isFocused() && 
-                        m_theme.stickUnfocusPixmap().pixmap.drawable() != 0) {
+                        m_theme.stickUnfocusPixmap().pixmap().drawable() != 0) {
                        // not focused
                        FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                            stickUnfocusPixmap().
-                                                            pixmap.drawable());
+                                                            pixmap().drawable());
                    } else { // focused
                        FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                            stickPixmap().
-                                                            pixmap.drawable());
+                                                            pixmap().drawable());
                    }
                }
@@ -172,24 +172,24 @@ void WinButton::drawType() {
        break;
    case CLOSE:
        
-        if (m_theme.closePixmap().pixmap.drawable() != 0) {
+        if (m_theme.closePixmap().pixmap().drawable() != 0) {
            if (pressed()) { 
                FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                    closePressedPixmap().
-                                                    pixmap.drawable());
+                                                    pixmap().drawable());
-            } else if (m_theme.closePixmap().pixmap.drawable()) {
+            } else if (m_theme.closePixmap().pixmap().drawable()) {
                // check focus 
                if (!m_listen_to.isFocused() && 
-                    m_theme.closeUnfocusPixmap().pixmap.drawable() != 0) {
+                    m_theme.closeUnfocusPixmap().pixmap().drawable() != 0) {
                    // not focused
                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                        closeUnfocusPixmap().
-                                                        pixmap.drawable());
+                                                        pixmap().drawable());
                } else { // focused
                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                        closePixmap().
-                                                        pixmap.drawable());
+                                                        pixmap().drawable());
                }
            }
            
@@ -207,23 +207,23 @@ void WinButton::drawType() {
        }
        break;
    case SHADE:
-        if (m_theme.shadePixmap().pixmap.drawable() != 0) {
+        if (m_theme.shadePixmap().pixmap().drawable() != 0) {
            if (pressed()) { 
                FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                    shadePressedPixmap().
-                                                    pixmap.drawable());
+                                                    pixmap().drawable());
-            } else if (m_theme.shadePixmap().pixmap.drawable()) {
+            } else if (m_theme.shadePixmap().pixmap().drawable()) {
                // check focus 
                if (!m_listen_to.isFocused() && 
-                    m_theme.shadeUnfocusPixmap().pixmap.drawable() != 0) {
+                    m_theme.shadeUnfocusPixmap().pixmap().drawable() != 0) {
                    // not focused
                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                        shadeUnfocusPixmap().
-                                                        pixmap.drawable());
+                                                        pixmap().drawable());
                } else { // focused
                    FbTk::FbWindow::setBackgroundPixmap(m_theme.
                                                        shadePixmap().
-                                                        pixmap.drawable());
+                                                        pixmap().drawable());
                }
            }
author	fluxgen <fluxgen>	2003-08-22 21:35:40 (GMT)
committer	fluxgen <fluxgen>	2003-08-22 21:35:40 (GMT)
commit	dc3f13d2fc3e731e8929ec782cad1c1e2191802e (patch)
tree	569639abb07294799706568ba4585a7577d6fb94 /src/WinButton.cc
parent	834645f54563fc9a73a845e83ad687700ffecee1 (diff)
download	fluxbox-dc3f13d2fc3e731e8929ec782cad1c1e2191802e.zip fluxbox-dc3f13d2fc3e731e8929ec782cad1c1e2191802e.tar.bz2

diff --git a/src/WinButton.cc b/src/WinButton.cc index 01684fb..2534296 100644 --- a/src/WinButton.cc +++ b/src/WinButton.cc
@@ -19,7 +19,7 @@
19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER	19	// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	/// $Id: WinButton.cc,v 1.9 2003/08/22 15:04:18 fluxgen Exp $	22	/// $Id: WinButton.cc,v 1.10 2003/08/22 21:33:13 fluxgen Exp $
23		23
24	#include "WinButton.hh"	24	#include "WinButton.hh"
25	#include "App.hh"	25	#include "App.hh"
@@ -52,23 +52,23 @@ void WinButton::drawType() {
52		52
53	switch (m_type) {	53	switch (m_type) {
54	case MAXIMIZE:	54	case MAXIMIZE:
55	if (m_theme.maximizePixmap().pixmap.drawable() != 0) {	55	if (m_theme.maximizePixmap().pixmap().drawable() != 0) {
56	if (pressed()) {	56	if (pressed()) {
57	FbTk::FbWindow::setBackgroundPixmap(m_theme.	57	FbTk::FbWindow::setBackgroundPixmap(m_theme.
58	maximizePressedPixmap().	58	maximizePressedPixmap().
59	pixmap.drawable());	59	pixmap().drawable());
60	} else if (m_theme.maximizePixmap().pixmap.drawable()) {	60	} else if (m_theme.maximizePixmap().pixmap().drawable()) {
61	// check focus	61	// check focus
62	if (!m_listen_to.isFocused() &&	62	if (!m_listen_to.isFocused() &&
63	m_theme.maximizeUnfocusPixmap().pixmap.drawable() != 0) {	63	m_theme.maximizeUnfocusPixmap().pixmap().drawable() != 0) {
64	// not focused	64	// not focused
65	FbTk::FbWindow::setBackgroundPixmap(m_theme.	65	FbTk::FbWindow::setBackgroundPixmap(m_theme.
66	maximizeUnfocusPixmap().	66	maximizeUnfocusPixmap().
67	pixmap.drawable());	67	pixmap().drawable());
68	} else { // focused	68	} else { // focused
69	FbTk::FbWindow::setBackgroundPixmap(m_theme.	69	FbTk::FbWindow::setBackgroundPixmap(m_theme.
70	maximizePixmap().	70	maximizePixmap().
71	pixmap.drawable());	71	pixmap().drawable());
72	}	72	}
73	}	73	}
74		74
@@ -84,23 +84,23 @@ void WinButton::drawType() {
84	}	84	}
85	break;	85	break;
86	case MINIMIZE:	86	case MINIMIZE:
87	if (m_theme.iconifyPixmap().pixmap.drawable() != 0) {	87	if (m_theme.iconifyPixmap().pixmap().drawable() != 0) {
88	if (pressed()) {	88	if (pressed()) {
89	FbTk::FbWindow::setBackgroundPixmap(m_theme.	89	FbTk::FbWindow::setBackgroundPixmap(m_theme.
90	iconifyPressedPixmap().	90	iconifyPressedPixmap().
91	pixmap.drawable());	91	pixmap().drawable());
92	} else if (m_theme.iconifyPixmap().pixmap.drawable()){	92	} else if (m_theme.iconifyPixmap().pixmap().drawable()){
93	// check focus	93	// check focus
94	if (!m_listen_to.isFocused() &&	94	if (!m_listen_to.isFocused() &&
95	m_theme.iconifyUnfocusPixmap().pixmap.drawable() != 0) {	95	m_theme.iconifyUnfocusPixmap().pixmap().drawable() != 0) {
96	// not focused	96	// not focused
97	FbTk::FbWindow::setBackgroundPixmap(m_theme.	97	FbTk::FbWindow::setBackgroundPixmap(m_theme.
98	iconifyUnfocusPixmap().	98	iconifyUnfocusPixmap().
99	pixmap.drawable());	99	pixmap().drawable());
100	} else { // focused	100	} else { // focused
101	FbTk::FbWindow::setBackgroundPixmap(m_theme.	101	FbTk::FbWindow::setBackgroundPixmap(m_theme.
102	iconifyPixmap().	102	iconifyPixmap().
103	pixmap.drawable());	103	pixmap().drawable());
104	}	104	}
105	}	105	}
106		106
@@ -114,41 +114,41 @@ void WinButton::drawType() {
114	}	114	}
115	break;	115	break;
116	case STICK:	116	case STICK:
117	if (m_theme.stickPixmap().pixmap.drawable() != 0) {	117	if (m_theme.stickPixmap().pixmap().drawable() != 0) {
118	if (m_listen_to.isStuck() &&	118	if (m_listen_to.isStuck() &&
119	m_theme.stuckPixmap().pixmap.drawable() &&	119	m_theme.stuckPixmap().pixmap().drawable() &&
120	! pressed()) { // we're using the same pixmap for pressed as in not stuck	120	! pressed()) { // we're using the same pixmap for pressed as in not stuck
121	// check focus	121	// check focus
122	if (!m_listen_to.isFocused() &&	122	if (!m_listen_to.isFocused() &&
123	m_theme.stuckUnfocusPixmap().pixmap.drawable() != 0) {	123	m_theme.stuckUnfocusPixmap().pixmap().drawable() != 0) {
124	// not focused	124	// not focused
125	FbTk::FbWindow::setBackgroundPixmap(m_theme.	125	FbTk::FbWindow::setBackgroundPixmap(m_theme.
126	stuckUnfocusPixmap().	126	stuckUnfocusPixmap().
127	pixmap.drawable());	127	pixmap().drawable());
128	} else { // focused	128	} else { // focused
129	FbTk::FbWindow::setBackgroundPixmap(m_theme.	129	FbTk::FbWindow::setBackgroundPixmap(m_theme.
130	stuckPixmap().	130	stuckPixmap().
131	pixmap.drawable());	131	pixmap().drawable());
132	}	132	}
133	} else { // not stuck	133	} else { // not stuck
134		134
135	if (pressed()) {	135	if (pressed()) {
136	FbTk::FbWindow::setBackgroundPixmap(m_theme.	136	FbTk::FbWindow::setBackgroundPixmap(m_theme.
137	stickPressedPixmap().	137	stickPressedPixmap().
138	pixmap.drawable());	138	pixmap().drawable());
139		139
140	} else if (m_theme.stickPixmap().pixmap.drawable()) {	140	} else if (m_theme.stickPixmap().pixmap().drawable()) {
141	// check focus	141	// check focus
142	if (!m_listen_to.isFocused() &&	142	if (!m_listen_to.isFocused() &&
143	m_theme.stickUnfocusPixmap().pixmap.drawable() != 0) {	143	m_theme.stickUnfocusPixmap().pixmap().drawable() != 0) {
144	// not focused	144	// not focused
145	FbTk::FbWindow::setBackgroundPixmap(m_theme.	145	FbTk::FbWindow::setBackgroundPixmap(m_theme.
146	stickUnfocusPixmap().	146	stickUnfocusPixmap().
147	pixmap.drawable());	147	pixmap().drawable());
148	} else { // focused	148	} else { // focused
149	FbTk::FbWindow::setBackgroundPixmap(m_theme.	149	FbTk::FbWindow::setBackgroundPixmap(m_theme.
150	stickPixmap().	150	stickPixmap().
151	pixmap.drawable());	151	pixmap().drawable());
152	}	152	}
153		153
154	}	154	}
@@ -172,24 +172,24 @@ void WinButton::drawType() {
172	break;	172	break;
173	case CLOSE:	173	case CLOSE:
174		174
175	if (m_theme.closePixmap().pixmap.drawable() != 0) {	175	if (m_theme.closePixmap().pixmap().drawable() != 0) {
176	if (pressed()) {	176	if (pressed()) {
177	FbTk::FbWindow::setBackgroundPixmap(m_theme.	177	FbTk::FbWindow::setBackgroundPixmap(m_theme.
178	closePressedPixmap().	178	closePressedPixmap().
179	pixmap.drawable());	179	pixmap().drawable());
180		180
181	} else if (m_theme.closePixmap().pixmap.drawable()) {	181	} else if (m_theme.closePixmap().pixmap().drawable()) {
182	// check focus	182	// check focus
183	if (!m_listen_to.isFocused() &&	183	if (!m_listen_to.isFocused() &&
184	m_theme.closeUnfocusPixmap().pixmap.drawable() != 0) {	184	m_theme.closeUnfocusPixmap().pixmap().drawable() != 0) {
185	// not focused	185	// not focused
186	FbTk::FbWindow::setBackgroundPixmap(m_theme.	186	FbTk::FbWindow::setBackgroundPixmap(m_theme.
187	closeUnfocusPixmap().	187	closeUnfocusPixmap().
188	pixmap.drawable());	188	pixmap().drawable());
189	} else { // focused	189	} else { // focused
190	FbTk::FbWindow::setBackgroundPixmap(m_theme.	190	FbTk::FbWindow::setBackgroundPixmap(m_theme.
191	closePixmap().	191	closePixmap().
192	pixmap.drawable());	192	pixmap().drawable());
193	}	193	}
194	}	194	}
195		195
@@ -207,23 +207,23 @@ void WinButton::drawType() {
207	}	207	}
208	break;	208	break;
209	case SHADE:	209	case SHADE:
210	if (m_theme.shadePixmap().pixmap.drawable() != 0) {	210	if (m_theme.shadePixmap().pixmap().drawable() != 0) {
211	if (pressed()) {	211	if (pressed()) {
212	FbTk::FbWindow::setBackgroundPixmap(m_theme.	212	FbTk::FbWindow::setBackgroundPixmap(m_theme.
213	shadePressedPixmap().	213	shadePressedPixmap().
214	pixmap.drawable());	214	pixmap().drawable());
215	} else if (m_theme.shadePixmap().pixmap.drawable()) {	215	} else if (m_theme.shadePixmap().pixmap().drawable()) {
216	// check focus	216	// check focus
217	if (!m_listen_to.isFocused() &&	217	if (!m_listen_to.isFocused() &&
218	m_theme.shadeUnfocusPixmap().pixmap.drawable() != 0) {	218	m_theme.shadeUnfocusPixmap().pixmap().drawable() != 0) {
219	// not focused	219	// not focused
220	FbTk::FbWindow::setBackgroundPixmap(m_theme.	220	FbTk::FbWindow::setBackgroundPixmap(m_theme.
221	shadeUnfocusPixmap().	221	shadeUnfocusPixmap().
222	pixmap.drawable());	222	pixmap().drawable());
223	} else { // focused	223	} else { // focused
224	FbTk::FbWindow::setBackgroundPixmap(m_theme.	224	FbTk::FbWindow::setBackgroundPixmap(m_theme.
225	shadePixmap().	225	shadePixmap().
226	pixmap.drawable());	226	pixmap().drawable());
227	}	227	}
228	}	228	}
229		229