diff libgui/src/main-window.h @ 19484:7934b56c8b7b

maint: Periodic merge of gui-release to default.
author Rik <rik@octave.org>
date Tue, 30 Dec 2014 20:41:00 -0800
parents 912158cf524d be53bf420464
children c8cb111e727e
line wrap: on
line diff
--- a/libgui/src/main-window.h	Tue Dec 30 20:34:55 2014 -0800
+++ b/libgui/src/main-window.h	Tue Dec 30 20:41:00 2014 -0800
@@ -80,6 +80,10 @@
   void focus_command_window (void);
 
 signals:
+
+  void active_dock_changed (octave_dock_widget *, octave_dock_widget *);
+  void editor_focus_changed (bool);
+
   void settings_changed (const QSettings *);
   void init_terminal_size_signal (void);
   void new_file_signal (const QString&);
@@ -98,6 +102,9 @@
 
 public slots:
 
+  void focus_changed (QWidget *w_old, QWidget *w_new);
+
+
   void report_status_message (const QString& statusMessage);
   void handle_save_workspace_request (void);
   void handle_load_workspace_request (const QString& file = QString ());
@@ -311,6 +318,7 @@
     list.append (static_cast<octave_dock_widget *> (workspace_window));
     return list;
   }
+  octave_dock_widget *_active_dock;
 
   QString _release_notes_icon;