comparison libinterp/corefcn/graphics.cc @ 18499:c579bd4e12c9

maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Thu, 20 Feb 2014 14:27:48 -0500
parents 0cbd0d285541 2e7cad6f180c
children 3dac2a233386
comparison
equal deleted inserted replaced
18497:4e0d72145c5a 18499:c579bd4e12c9
9674 gtk_manager *gtk_manager::instance = 0; 9674 gtk_manager *gtk_manager::instance = 0;
9675 9675
9676 gtk_manager::gtk_manager (void) 9676 gtk_manager::gtk_manager (void)
9677 : dtk (), available_toolkits (), loaded_toolkits () 9677 : dtk (), available_toolkits (), loaded_toolkits ()
9678 { 9678 {
9679 #if defined (HAVE_FLTK) 9679 #if defined (HAVE_QT)
9680 dtk = display_info::display_available () ? "qt" : "gnuplot";
9681 #elif defined (HAVE_FLTK)
9680 dtk = display_info::display_available () ? "fltk" : "gnuplot"; 9682 dtk = display_info::display_available () ? "fltk" : "gnuplot";
9681 #else 9683 #else
9682 dtk = "gnuplot"; 9684 dtk = "gnuplot";
9683 #endif 9685 #endif
9684 } 9686 }