aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-12-03 21:59:58 (GMT)
committerfluxgen <fluxgen>2002-12-03 21:59:58 (GMT)
commiteb9bb882ed9fb21c8048a71e41a7a2cedec3f9c3 (patch)
tree95c565fff12e8d42a7f8cf9e014dbedc507f72a0 /src
parentcc775983b62d7d6bee4ab73a09c101a40790947f (diff)
downloadfluxbox-eb9bb882ed9fb21c8048a71e41a7a2cedec3f9c3.zip
fluxbox-eb9bb882ed9fb21c8048a71e41a7a2cedec3f9c3.tar.bz2
initiate s_display in assignment too
Diffstat (limited to 'src')
-rw-r--r--src/FbTk/FbWindow.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index d42db25..4a3f66c 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.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: FbWindow.cc,v 1.1 2002/12/03 16:25:27 fluxgen Exp $ 22// $Id: FbWindow.cc,v 1.2 2002/12/03 21:59:58 fluxgen Exp $
23 23
24#include "FbWindow.hh" 24#include "FbWindow.hh"
25 25
@@ -33,7 +33,8 @@ namespace FbTk {
33Display *FbWindow::s_display = 0; 33Display *FbWindow::s_display = 0;
34 34
35FbWindow::FbWindow():m_window(0) { 35FbWindow::FbWindow():m_window(0) {
36 36 if (s_display == 0)
37 s_display = App::instance()->display();
37} 38}
38 39
39FbWindow::FbWindow(int screen_num, 40FbWindow::FbWindow(int screen_num,
@@ -95,7 +96,8 @@ FbWindow &FbWindow::operator = (Window win) {
95 if (m_window != 0) 96 if (m_window != 0)
96 XDestroyWindow(s_display, m_window); 97 XDestroyWindow(s_display, m_window);
97 m_window = win; 98 m_window = win;
98 updateGeometry(); 99 if (m_window != 0)
100 updateGeometry();
99 101
100 return *this; 102 return *this;
101} 103}