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