Mercurial > octave
diff libinterp/corefcn/graphics.in.h @ 18557:ca1648b2e673 gui-release
set default toolkit when registering toolkits (bug #41665).
* graphics.in.h, graphics.cc (gtk_manager::gtk_manager):
Don't set default toolkit.
(gtk_manager::do_register_toolkit): Set default toolkit here.
(gtk_manager::do_unregister_toolkit): If removing default toolkit,
reset it using same rules as in do_register_toolkit.
| author | Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 10 Mar 2014 10:46:37 -0500 |
| parents | ebb3ef964372 |
| children | cd83730e5e38 b314efd58072 |
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.in.h Tue Mar 11 21:15:06 2014 -0400 +++ b/libinterp/corefcn/graphics.in.h Mon Mar 10 10:46:37 2014 -0500 @@ -2273,7 +2273,7 @@ private: - gtk_manager (void); + gtk_manager (void) { } ~gtk_manager (void) { } @@ -2322,15 +2322,9 @@ graphics_toolkit do_get_toolkit (void) const; - void do_register_toolkit (const std::string& name) - { - available_toolkits.insert (name); - } - - void do_unregister_toolkit (const std::string& name) - { - available_toolkits.erase (name); - } + void do_register_toolkit (const std::string& name); + + void do_unregister_toolkit (const std::string& name); void do_load_toolkit (const graphics_toolkit& tk) {