Mercurial > octave-nkf
comparison libgui/src/main-window.cc @ 20313:3b25741a9927
Avoid HAVE_ macro in header file.
* main-window.cc (main_window::dock_widget_list): Define here.
* main-window.h: Not here.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 24 Jun 2015 11:56:32 -0400 |
parents | 0d94ec291ee6 |
children |
comparison
equal
deleted
inserted
replaced
20312:48d9001bdee3 | 20313:3b25741a9927 |
---|---|
2405 _release_notes_action->setShortcut (no_key); | 2405 _release_notes_action->setShortcut (no_key); |
2406 _current_news_action->setShortcut (no_key); | 2406 _current_news_action->setShortcut (no_key); |
2407 } | 2407 } |
2408 } | 2408 } |
2409 | 2409 |
2410 QList<octave_dock_widget *> | |
2411 main_window::dock_widget_list () | |
2412 { | |
2413 QList<octave_dock_widget *> list = QList<octave_dock_widget *> (); | |
2414 list.append (static_cast<octave_dock_widget *> (command_window)); | |
2415 list.append (static_cast<octave_dock_widget *> (history_window)); | |
2416 list.append (static_cast<octave_dock_widget *> (file_browser_window)); | |
2417 list.append (static_cast<octave_dock_widget *> (doc_browser_window)); | |
2418 #ifdef HAVE_QSCINTILLA | |
2419 list.append (static_cast<octave_dock_widget *> (editor_window)); | |
2420 #endif | |
2421 list.append (static_cast<octave_dock_widget *> (workspace_window)); | |
2422 return list; | |
2423 } | |
2424 | |
2410 void | 2425 void |
2411 main_window::set_screen_size (int ht, int wd) | 2426 main_window::set_screen_size (int ht, int wd) |
2412 { | 2427 { |
2413 octave_link::post_event (this, &main_window::set_screen_size_callback, | 2428 octave_link::post_event (this, &main_window::set_screen_size_callback, |
2414 int_pair (ht, wd)); | 2429 int_pair (ht, wd)); |