Mercurial > octave-nkf
diff libinterp/corefcn/graphics.cc @ 19630:0e1f5a750d00
maint: Periodic merge of gui-release to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 20 Jan 2015 10:24:46 -0500 |
| parents | 03067dab10ca be7ac98fab43 |
| children | db92e7e28e1f |
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc Tue Jan 20 09:55:41 2015 -0500 +++ b/libinterp/corefcn/graphics.cc Tue Jan 20 10:24:46 2015 -0500 @@ -4321,7 +4321,7 @@ else if (std::abs (sz(0) - 182.0 * mm2in) + std::abs (sz(1) - 257.0 * mm2in) < tol) typ = "b5"; - else if (std::abs (sz(0) - 9.0) + else if (std::abs (sz(0) - 9.0) + std::abs (sz(1) - 12.0) < tol) typ = "arch-a"; else if (std::abs (sz(0) - 12.0) @@ -4336,7 +4336,7 @@ else if (std::abs (sz(0) - 36.0) + std::abs (sz(1) - 48.0) < tol) typ = "arch-e"; - else if (std::abs (sz(0) - 8.5) + else if (std::abs (sz(0) - 8.5) + std::abs (sz(1) - 11.0) < tol) typ = "a"; else if (std::abs (sz(0) - 11.0) @@ -10681,7 +10681,7 @@ return retval; } -void +void gtk_manager::do_register_toolkit (const std::string& name) { if (dtk.empty () || name == "qt" @@ -10692,7 +10692,7 @@ available_toolkits.insert (name); } -void +void gtk_manager::do_unregister_toolkit (const std::string& name) { available_toolkits.erase (name);