[6bec10c] | 1 | /* cavernlog.cc |
---|
| 2 | * Run cavern inside an Aven window |
---|
| 3 | * |
---|
[3d3fb6c] | 4 | * Copyright (C) 2005,2006,2010,2011,2012,2014 Olly Betts |
---|
[6bec10c] | 5 | * |
---|
| 6 | * This program is free software; you can redistribute it and/or modify |
---|
| 7 | * it under the terms of the GNU General Public License as published by |
---|
| 8 | * the Free Software Foundation; either version 2 of the License, or |
---|
| 9 | * (at your option) any later version. |
---|
| 10 | * |
---|
| 11 | * This program is distributed in the hope that it will be useful, |
---|
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
---|
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
---|
| 14 | * GNU General Public License for more details. |
---|
| 15 | * |
---|
| 16 | * You should have received a copy of the GNU General Public License |
---|
| 17 | * along with this program; if not, write to the Free Software |
---|
| 18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
---|
| 19 | */ |
---|
| 20 | |
---|
| 21 | #ifdef HAVE_CONFIG_H |
---|
| 22 | # include <config.h> |
---|
| 23 | #endif |
---|
| 24 | |
---|
| 25 | #include "aven.h" |
---|
| 26 | #include "cavernlog.h" |
---|
| 27 | #include "filename.h" |
---|
[fb5887c] | 28 | #include "mainfrm.h" |
---|
[6bec10c] | 29 | #include "message.h" |
---|
| 30 | |
---|
[baeae66] | 31 | #include <errno.h> |
---|
[6bec10c] | 32 | #include <stdio.h> |
---|
[a90632c] | 33 | #include <stdlib.h> |
---|
[6bec10c] | 34 | |
---|
| 35 | // For select(): |
---|
| 36 | #ifdef HAVE_SYS_SELECT_H |
---|
| 37 | #include <sys/select.h> |
---|
| 38 | #endif |
---|
| 39 | #include <sys/time.h> |
---|
| 40 | #include <sys/types.h> |
---|
| 41 | #include <unistd.h> |
---|
| 42 | |
---|
[81e1aa4] | 43 | enum { LOG_REPROCESS = 1234 }; |
---|
[fb5887c] | 44 | |
---|
| 45 | BEGIN_EVENT_TABLE(CavernLogWindow, wxHtmlWindow) |
---|
[81e1aa4] | 46 | EVT_BUTTON(LOG_REPROCESS, CavernLogWindow::OnReprocess) |
---|
[fb5887c] | 47 | EVT_BUTTON(wxID_OK, CavernLogWindow::OnOK) |
---|
| 48 | END_EVENT_TABLE() |
---|
| 49 | |
---|
[6bec10c] | 50 | static wxString escape_for_shell(wxString s, bool protect_dash = false) |
---|
| 51 | { |
---|
| 52 | size_t p = 0; |
---|
| 53 | #ifdef __WXMSW__ |
---|
| 54 | bool needs_quotes = false; |
---|
| 55 | while (p < s.size()) { |
---|
[eff69a7] | 56 | wxChar ch = s[p]; |
---|
| 57 | if (ch < 127) { |
---|
| 58 | if (ch == wxT('"')) { |
---|
[6baad4a] | 59 | s.insert(p, 1, wxT('\\')); |
---|
[eff69a7] | 60 | ++p; |
---|
| 61 | needs_quotes = true; |
---|
| 62 | } else if (strchr(" <>&|^", ch)) { |
---|
| 63 | needs_quotes = true; |
---|
| 64 | } |
---|
[6bec10c] | 65 | } |
---|
| 66 | ++p; |
---|
| 67 | } |
---|
| 68 | if (needs_quotes) { |
---|
[6baad4a] | 69 | s.insert(0u, 1, wxT('"')); |
---|
[15322f2] | 70 | s += wxT('"'); |
---|
[6bec10c] | 71 | } |
---|
| 72 | #else |
---|
| 73 | if (protect_dash && !s.empty() && s[0u] == '-') { |
---|
| 74 | // If the filename starts with a '-', protect it from being |
---|
| 75 | // treated as an option by prepending "./". |
---|
[5627cbb] | 76 | s.insert(0, wxT("./")); |
---|
[6bec10c] | 77 | p = 2; |
---|
| 78 | } |
---|
| 79 | while (p < s.size()) { |
---|
| 80 | // Exclude a few safe characters which are common in filenames |
---|
| 81 | if (!isalnum(s[p]) && strchr("/._-", s[p]) == NULL) { |
---|
[6baad4a] | 82 | s.insert(p, 1, wxT('\\')); |
---|
[6bec10c] | 83 | ++p; |
---|
| 84 | } |
---|
| 85 | ++p; |
---|
| 86 | } |
---|
| 87 | #endif |
---|
| 88 | return s; |
---|
| 89 | } |
---|
| 90 | |
---|
[fb5887c] | 91 | CavernLogWindow::CavernLogWindow(MainFrm * mainfrm_, wxWindow * parent) |
---|
| 92 | : wxHtmlWindow(parent), mainfrm(mainfrm_) |
---|
| 93 | { |
---|
[93ff5cc] | 94 | int fsize = parent->GetFont().GetPointSize(); |
---|
| 95 | int sizes[7] = { fsize, fsize, fsize, fsize, fsize, fsize, fsize }; |
---|
[5627cbb] | 96 | SetFonts(wxString(), wxString(), sizes); |
---|
[93ff5cc] | 97 | } |
---|
| 98 | |
---|
[6bec10c] | 99 | void |
---|
| 100 | CavernLogWindow::OnLinkClicked(const wxHtmlLinkInfo &link) |
---|
| 101 | { |
---|
| 102 | wxString href = link.GetHref(); |
---|
| 103 | wxString title = link.GetTarget(); |
---|
[5627cbb] | 104 | size_t colon = href.rfind(wxT(':')); |
---|
[3d3fb6c] | 105 | if (colon == wxString::npos) |
---|
| 106 | return; |
---|
| 107 | size_t colon2 = href.rfind(wxT(':'), colon - 1); |
---|
| 108 | if (colon2 != wxString::npos) swap(colon, colon2); |
---|
[6bec10c] | 109 | #ifdef __WXMSW__ |
---|
[3d3fb6c] | 110 | wxString cmd = wxT("notepad $f"); |
---|
[89a1b72] | 111 | #elif defined __WXMAC__ |
---|
[3d3fb6c] | 112 | wxString cmd = wxT("open -t $f"); |
---|
[6bec10c] | 113 | #else |
---|
[3d3fb6c] | 114 | wxString cmd = wxT("x-terminal-emulator -title $t -e vim +'call cursor($l,$c)' $f"); |
---|
| 115 | // wxString cmd = wxT("gedit -b $f +$l:$c $f"); |
---|
| 116 | // wxString cmd = wxT("x-terminal-emulator -title $t -e emacs +$l $f"); |
---|
| 117 | // wxString cmd = wxT("x-terminal-emulator -title $t -e nano +$l $f"); |
---|
| 118 | // wxString cmd = wxT("x-terminal-emulator -title $t -e jed -g $l $f"); |
---|
[6bec10c] | 119 | #endif |
---|
[3d3fb6c] | 120 | const char * p = getenv("SURVEXEDITOR"); |
---|
| 121 | if (p) { |
---|
| 122 | cmd = wxString(p, wxConvUTF8); |
---|
| 123 | if (!cmd.find(wxT("$f"))) { |
---|
| 124 | cmd += wxT(" $f"); |
---|
[6bec10c] | 125 | } |
---|
[3d3fb6c] | 126 | } |
---|
| 127 | size_t i = 0; |
---|
| 128 | while ((i = cmd.find(wxT('$'), i)) != wxString::npos) { |
---|
| 129 | if (++i >= cmd.size()) break; |
---|
| 130 | switch ((int)cmd[i]) { |
---|
| 131 | case wxT('$'): |
---|
| 132 | cmd.erase(i, 1); |
---|
| 133 | break; |
---|
| 134 | case wxT('f'): { |
---|
| 135 | wxString f = escape_for_shell(href.substr(0, colon), true); |
---|
| 136 | cmd.replace(i - 1, 2, f); |
---|
| 137 | i += f.size() - 1; |
---|
| 138 | break; |
---|
| 139 | } |
---|
| 140 | case wxT('t'): { |
---|
| 141 | wxString t = escape_for_shell(title); |
---|
| 142 | cmd.replace(i - 1, 2, t); |
---|
| 143 | i += t.size() - 1; |
---|
| 144 | break; |
---|
| 145 | } |
---|
| 146 | case wxT('l'): { |
---|
| 147 | wxString l = escape_for_shell(href.substr(colon + 1, colon2 - colon - 1)); |
---|
| 148 | cmd.replace(i - 1, 2, l); |
---|
| 149 | i += l.size() - 1; |
---|
| 150 | break; |
---|
[1d71195] | 151 | } |
---|
[3d3fb6c] | 152 | case wxT('c'): { |
---|
| 153 | wxString l; |
---|
| 154 | if (colon2 == wxString::npos) |
---|
| 155 | l = wxT("0"); |
---|
| 156 | else |
---|
| 157 | l = escape_for_shell(href.substr(colon2 + 1)); |
---|
| 158 | cmd.replace(i - 1, 2, l); |
---|
| 159 | i += l.size() - 1; |
---|
| 160 | break; |
---|
| 161 | } |
---|
| 162 | default: |
---|
| 163 | ++i; |
---|
[6bec10c] | 164 | } |
---|
[3d3fb6c] | 165 | } |
---|
[fc364dc] | 166 | #ifdef __WXMSW__ |
---|
[3d3fb6c] | 167 | if (_wsystem(cmd.c_str()) >= 0) |
---|
| 168 | return; |
---|
[fc364dc] | 169 | #else |
---|
[3d3fb6c] | 170 | if (system(cmd.mb_str()) >= 0) |
---|
| 171 | return; |
---|
[fc364dc] | 172 | #endif |
---|
[3d3fb6c] | 173 | wxString m; |
---|
| 174 | m.Printf(wmsg(/*Couldn’t run external command: “%s”*/17), cmd.c_str()); |
---|
| 175 | m += wxT(" ("); |
---|
| 176 | m += wxString(strerror(errno), wxConvUTF8); |
---|
| 177 | m += wxT(')'); |
---|
| 178 | wxGetApp().ReportError(m); |
---|
[6bec10c] | 179 | } |
---|
| 180 | |
---|
[5627cbb] | 181 | int |
---|
[6bec10c] | 182 | CavernLogWindow::process(const wxString &file) |
---|
| 183 | { |
---|
[fb5887c] | 184 | SetFocus(); |
---|
| 185 | filename = file; |
---|
| 186 | |
---|
[6bec10c] | 187 | #ifdef __WXMSW__ |
---|
[15322f2] | 188 | SetEnvironmentVariable(wxT("SURVEX_UTF8"), wxT("1")); |
---|
[6bec10c] | 189 | #else |
---|
[06b1227] | 190 | setenv("SURVEX_UTF8", "1", 1); |
---|
[6bec10c] | 191 | #endif |
---|
[93ff5cc] | 192 | |
---|
[6bec10c] | 193 | wxString escaped_file = escape_for_shell(file, true); |
---|
[a90632c] | 194 | #ifdef __WXMSW__ |
---|
| 195 | wxString cmd; |
---|
[9e50f755] | 196 | { |
---|
[6baad4a] | 197 | DWORD len = 256; |
---|
[6f8cb1c] | 198 | wchar_t *buf = NULL; |
---|
[6baad4a] | 199 | while (1) { |
---|
| 200 | DWORD got; |
---|
| 201 | buf = (wchar_t*)osrealloc(buf, len * 2); |
---|
| 202 | got = GetModuleFileNameW(NULL, buf, len); |
---|
| 203 | if (got < len) break; |
---|
| 204 | len += len; |
---|
| 205 | } |
---|
| 206 | /* Strange Win32 nastiness - strip prefix "\\?\" if present */ |
---|
| 207 | if (wcsncmp(buf, L"\\\\?\\", 4) == 0) buf += 4; |
---|
| 208 | wchar_t * slash = wcsrchr(buf, L'\\'); |
---|
[9e50f755] | 209 | if (slash) { |
---|
[6baad4a] | 210 | cmd.assign(buf, slash - buf + 1); |
---|
[9e50f755] | 211 | } |
---|
[a90632c] | 212 | } |
---|
| 213 | cmd += L"cavern"; |
---|
[9e50f755] | 214 | cmd = escape_for_shell(cmd, false); |
---|
[a90632c] | 215 | #else |
---|
| 216 | char *cavern = use_path(msg_exepth(), "cavern"); |
---|
[2e4b8cd] | 217 | wxString cmd = escape_for_shell(wxString(cavern, wxConvUTF8), false); |
---|
[08b4401] | 218 | osfree(cavern); |
---|
[a90632c] | 219 | #endif |
---|
[5627cbb] | 220 | cmd += wxT(" -o "); |
---|
[6bec10c] | 221 | cmd += escaped_file; |
---|
[5627cbb] | 222 | cmd += wxT(' '); |
---|
[6bec10c] | 223 | cmd += escaped_file; |
---|
| 224 | |
---|
[fc364dc] | 225 | #ifdef __WXMSW__ |
---|
| 226 | FILE * cavern_out = _wpopen(cmd.c_str(), L"r"); |
---|
| 227 | #else |
---|
[ffe7efe4] | 228 | FILE * cavern_out = popen(cmd.mb_str(), "r"); |
---|
[fc364dc] | 229 | #endif |
---|
[6bec10c] | 230 | if (!cavern_out) { |
---|
[5627cbb] | 231 | wxString m; |
---|
[3d3fb6c] | 232 | m.Printf(wmsg(/*Couldn’t run external command: “%s”*/17), cmd.c_str()); |
---|
[5627cbb] | 233 | m += wxT(" ("); |
---|
[2e4b8cd] | 234 | m += wxString(strerror(errno), wxConvUTF8); |
---|
[5627cbb] | 235 | m += wxT(')'); |
---|
[6bec10c] | 236 | wxGetApp().ReportError(m); |
---|
[5627cbb] | 237 | return -2; |
---|
[6bec10c] | 238 | } |
---|
| 239 | |
---|
| 240 | int cavern_fd; |
---|
| 241 | #ifdef __WXMSW__ |
---|
| 242 | cavern_fd = _fileno(cavern_out); |
---|
| 243 | #else |
---|
| 244 | cavern_fd = fileno(cavern_out); |
---|
| 245 | #endif |
---|
| 246 | assert(cavern_fd < FD_SETSIZE); // FIXME we shouldn't just assert, but what else to do? |
---|
| 247 | wxString cur; |
---|
[5627cbb] | 248 | int link_count = 0; |
---|
[6bec10c] | 249 | // We're only guaranteed one character of pushback by ungetc() but we |
---|
| 250 | // need two so for portability we implement the second ourselves. |
---|
| 251 | int left = EOF; |
---|
| 252 | while (!feof(cavern_out)) { |
---|
| 253 | fd_set rfds, efds; |
---|
| 254 | FD_ZERO(&rfds); |
---|
| 255 | FD_SET(cavern_fd, &rfds); |
---|
| 256 | FD_ZERO(&efds); |
---|
| 257 | FD_SET(cavern_fd, &efds); |
---|
[1e2499c] | 258 | // Timeout instantly. |
---|
[6bec10c] | 259 | struct timeval timeout; |
---|
| 260 | timeout.tv_sec = 0; |
---|
[1e2499c] | 261 | timeout.tv_usec = 0; |
---|
[6bec10c] | 262 | if (select(cavern_fd + 1, &rfds, NULL, &efds, &timeout) == 0) { |
---|
[1e2499c] | 263 | Update(); |
---|
| 264 | FD_SET(cavern_fd, &rfds); |
---|
| 265 | FD_SET(cavern_fd, &efds); |
---|
| 266 | // Set timeout to 0.1 seconds. |
---|
| 267 | timeout.tv_sec = 0; |
---|
| 268 | timeout.tv_usec = 100000; |
---|
| 269 | if (select(cavern_fd + 1, &rfds, NULL, &efds, &timeout) == 0) { |
---|
| 270 | wxYield(); |
---|
| 271 | continue; |
---|
| 272 | } |
---|
[6bec10c] | 273 | } |
---|
[6b088f6] | 274 | if (!FD_ISSET(cavern_fd, &rfds)) { |
---|
[6bec10c] | 275 | // Error, which pclose() should report. |
---|
| 276 | break; |
---|
| 277 | } |
---|
| 278 | int ch; |
---|
| 279 | if (left == EOF) { |
---|
[0a85859] | 280 | ch = GETC(cavern_out); |
---|
[6bec10c] | 281 | if (ch == EOF) break; |
---|
| 282 | } else { |
---|
| 283 | ch = left; |
---|
| 284 | left = EOF; |
---|
| 285 | } |
---|
| 286 | // Decode UTF-8 first to avoid security issues with <, >, &, etc |
---|
| 287 | // encoded using multibyte encodings. |
---|
| 288 | if (ch >= 0xc0 && ch < 0xf0) { |
---|
[0a85859] | 289 | int ch1 = GETC(cavern_out); |
---|
[6bec10c] | 290 | if ((ch1 & 0xc0) != 0x80) { |
---|
| 291 | left = ch1; |
---|
| 292 | } else if (ch < 0xe0) { |
---|
| 293 | /* 2 byte sequence */ |
---|
| 294 | ch = ((ch & 0x1f) << 6) | (ch1 & 0x3f); |
---|
| 295 | } else { |
---|
| 296 | /* 3 byte sequence */ |
---|
[0a85859] | 297 | int ch2 = GETC(cavern_out); |
---|
[6bec10c] | 298 | if ((ch2 & 0xc0) != 0x80) { |
---|
| 299 | ungetc(ch2, cavern_out); |
---|
| 300 | left = ch1; |
---|
| 301 | } else { |
---|
| 302 | ch = ((ch & 0x1f) << 12) | ((ch1 & 0x3f) << 6) | (ch2 & 0x3f); |
---|
| 303 | } |
---|
| 304 | } |
---|
| 305 | } |
---|
| 306 | |
---|
| 307 | switch (ch) { |
---|
| 308 | case '\r': |
---|
| 309 | // Ignore. |
---|
| 310 | break; |
---|
| 311 | case '\n': { |
---|
| 312 | if (cur.empty()) continue; |
---|
[a07ee70] | 313 | #ifndef __WXMSW__ |
---|
[6bec10c] | 314 | size_t colon = cur.find(':'); |
---|
[a07ee70] | 315 | #else |
---|
[6bec10c] | 316 | // If the path is "C:\path\to\file.svx" then don't split at the |
---|
| 317 | // : after the drive letter! FIXME: better to look for ": "? |
---|
[a07ee70] | 318 | size_t colon = cur.find(':', 2); |
---|
[6bec10c] | 319 | #endif |
---|
[bc8dfe7] | 320 | if (colon != wxString::npos && colon < cur.size() - 2) { |
---|
[a07ee70] | 321 | ++colon; |
---|
| 322 | size_t i = colon; |
---|
[bc8dfe7] | 323 | while (i < cur.size() - 2 && |
---|
[a07ee70] | 324 | cur[i] >= wxT('0') && cur[i] <= wxT('9')) { |
---|
| 325 | ++i; |
---|
| 326 | } |
---|
| 327 | if (i > colon && cur[i] == wxT(':') ) { |
---|
| 328 | colon = i; |
---|
[da96015] | 329 | // Check for column number. |
---|
| 330 | while (++i < cur.size() - 2 && |
---|
| 331 | cur[i] >= wxT('0') && cur[i] <= wxT('9')) { } |
---|
| 332 | if (i > colon + 1 && cur[i] == wxT(':') ) { |
---|
| 333 | colon = i; |
---|
| 334 | } |
---|
[5627cbb] | 335 | wxString tag = wxT("<a href=\""); |
---|
[a07ee70] | 336 | tag.append(cur, 0, colon); |
---|
| 337 | while (cur[++i] == wxT(' ')) { } |
---|
[5627cbb] | 338 | tag += wxT("\" target=\""); |
---|
[a07ee70] | 339 | tag.append(cur, i, wxString::npos); |
---|
[5627cbb] | 340 | tag += wxT("\">"); |
---|
[6bec10c] | 341 | cur.insert(0, tag); |
---|
[a07ee70] | 342 | cur.insert(colon + tag.size(), wxT("</a>")); |
---|
[5627cbb] | 343 | ++link_count; |
---|
[6bec10c] | 344 | } |
---|
| 345 | } |
---|
[93ff5cc] | 346 | |
---|
| 347 | // Save the scrollbar positions. |
---|
| 348 | int scroll_x = 0, scroll_y = 0; |
---|
| 349 | GetViewStart(&scroll_x, &scroll_y); |
---|
| 350 | |
---|
[5627cbb] | 351 | cur += wxT("<br>\n"); |
---|
[6bec10c] | 352 | AppendToPage(cur); |
---|
[93ff5cc] | 353 | |
---|
[5627cbb] | 354 | if (!link_count) { |
---|
| 355 | // Auto-scroll the window until we've reported a warning or |
---|
| 356 | // error. |
---|
| 357 | int x, y; |
---|
| 358 | GetVirtualSize(&x, &y); |
---|
| 359 | int xs, ys; |
---|
| 360 | GetClientSize(&xs, &ys); |
---|
| 361 | y -= ys; |
---|
| 362 | int xu, yu; |
---|
| 363 | GetScrollPixelsPerUnit(&xu, &yu); |
---|
[a75f5a1] | 364 | Scroll(scroll_x, y / yu); |
---|
| 365 | } else { |
---|
| 366 | // Restore the scrollbar positions. |
---|
| 367 | Scroll(scroll_x, scroll_y); |
---|
[5627cbb] | 368 | } |
---|
[a75f5a1] | 369 | |
---|
[6bec10c] | 370 | cur.clear(); |
---|
| 371 | break; |
---|
| 372 | } |
---|
| 373 | case '<': |
---|
[5627cbb] | 374 | cur += wxT("<"); |
---|
[6bec10c] | 375 | break; |
---|
| 376 | case '>': |
---|
[5627cbb] | 377 | cur += wxT(">"); |
---|
[6bec10c] | 378 | break; |
---|
| 379 | case '&': |
---|
[5627cbb] | 380 | cur += wxT("&"); |
---|
[6bec10c] | 381 | break; |
---|
[77b8654] | 382 | case '"': |
---|
| 383 | cur += wxT(""); |
---|
| 384 | continue; |
---|
[6bec10c] | 385 | default: |
---|
| 386 | if (ch >= 128) { |
---|
[5627cbb] | 387 | cur += wxString::Format(wxT("&#%u;"), ch); |
---|
[6bec10c] | 388 | } else { |
---|
| 389 | cur += (char)ch; |
---|
| 390 | } |
---|
| 391 | } |
---|
| 392 | } |
---|
[fb5887c] | 393 | |
---|
[93ff5cc] | 394 | int retval = pclose(cavern_out); |
---|
| 395 | if (retval) { |
---|
[2341559] | 396 | AppendToPage(wxString::Format(wxT("<avenbutton default id=1234 name=\"%s\">"), |
---|
| 397 | wmsg(/*Reprocess*/184).c_str())); |
---|
[93ff5cc] | 398 | if (retval == -1) { |
---|
[5627cbb] | 399 | wxString m = wxT("Problem running cavern: "); |
---|
| 400 | m += wxString(strerror(errno), wxConvUTF8); |
---|
[93ff5cc] | 401 | wxGetApp().ReportError(m); |
---|
[5627cbb] | 402 | return -2; |
---|
[93ff5cc] | 403 | } |
---|
[5627cbb] | 404 | return -1; |
---|
[6bec10c] | 405 | } |
---|
[fb5887c] | 406 | if (link_count) { |
---|
[2341559] | 407 | AppendToPage(wxString::Format(wxT("<avenbutton id=1234 name=\"%s\">"), |
---|
| 408 | wmsg(/*Reprocess*/184).c_str())); |
---|
[fb5887c] | 409 | AppendToPage(wxString::Format(wxT("<avenbutton default id=%d>"), (int)wxID_OK)); |
---|
| 410 | Update(); |
---|
| 411 | } |
---|
[5627cbb] | 412 | return link_count; |
---|
[6bec10c] | 413 | } |
---|
[fb5887c] | 414 | |
---|
| 415 | void |
---|
[81e1aa4] | 416 | CavernLogWindow::OnReprocess(wxCommandEvent & e) |
---|
[fb5887c] | 417 | { |
---|
| 418 | SetPage(wxString()); |
---|
| 419 | if (process(filename) == 0) { |
---|
| 420 | OnOK(e); |
---|
| 421 | } |
---|
| 422 | } |
---|
| 423 | |
---|
| 424 | void |
---|
| 425 | CavernLogWindow::OnOK(wxCommandEvent &) |
---|
| 426 | { |
---|
| 427 | mainfrm->InitialiseAfterLoad(filename); |
---|
| 428 | } |
---|