… | |
… | |
117 | #endif |
117 | #endif |
118 | |
118 | |
119 | delete TermWin.fontset; |
119 | delete TermWin.fontset; |
120 | |
120 | |
121 | if (display) |
121 | if (display) |
|
|
122 | { |
|
|
123 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
124 | delete menuBar.drawable; |
|
|
125 | //if (menuBar.win) |
|
|
126 | // XDestroyWindow (display->display, menuBar.win); |
|
|
127 | #endif |
|
|
128 | delete TermWin.drawable; |
|
|
129 | // destroy all windows |
122 | if (TermWin.parent[0]) |
130 | if (TermWin.parent[0]) |
123 | XDestroyWindow (display->display, TermWin.parent[0]); |
131 | XDestroyWindow (display->display, TermWin.parent[0]); |
|
|
132 | } |
124 | |
133 | |
125 | // TODO: free pixcolours, colours should become part of rxvt_display |
134 | // TODO: free pixcolours, colours should become part of rxvt_display |
126 | |
135 | |
127 | delete PixColors; |
136 | delete PixColors; |
128 | |
137 | |
… | |
… | |
249 | |
258 | |
250 | const char **cmd_argv = init_resources (argc, argv); |
259 | const char **cmd_argv = init_resources (argc, argv); |
251 | |
260 | |
252 | set_locale (""); |
261 | set_locale (""); |
253 | |
262 | |
254 | #if (MENUBAR_MAX) |
263 | #if MENUBAR_MAX |
255 | menubar_read (rs[Rs_menu]); |
264 | menubar_read (rs[Rs_menu]); |
256 | #endif |
265 | #endif |
257 | #ifdef HAVE_SCROLLBARS |
266 | #ifdef HAVE_SCROLLBARS |
258 | if (Options & Opt_scrollBar) |
267 | if (Options & Opt_scrollBar) |
259 | scrollBar.setIdle (); /* set existence for size calculations */ |
268 | scrollBar.setIdle (); /* set existence for size calculations */ |