diff options
author | Alex Merry <alex.merry@cs.ox.ac.uk> | 2012-12-03 19:02:53 +0000 |
---|---|---|
committer | Alex Merry <alex.merry@cs.ox.ac.uk> | 2012-12-04 11:12:28 +0000 |
commit | 94ff07fc9d728d97dde159e0c3e6ab80e29e0855 (patch) | |
tree | 2e74ff3d709db87e2e2b27aa501ed46727c054d7 /tikzit/src/gtk/Menu.h | |
parent | 0d715a7f17b8e5570b42d7802c502e4aa234a3c1 (diff) |
Refactor MainWindow into Application and Window
Basic multiple-window support, but no tools.
Diffstat (limited to 'tikzit/src/gtk/Menu.h')
-rw-r--r-- | tikzit/src/gtk/Menu.h | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/tikzit/src/gtk/Menu.h b/tikzit/src/gtk/Menu.h index 5a364e4..f195765 100644 --- a/tikzit/src/gtk/Menu.h +++ b/tikzit/src/gtk/Menu.h @@ -1,10 +1,6 @@ /* * Copyright 2011 Alex Merry <alex.merry@kdemail.net> * - * Stuff stolen from glade-window.c in Glade: - * Copyright (C) 2001 Ximian, Inc. - * Copyright (C) 2007 Vincent Geddes. - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of @@ -22,14 +18,14 @@ #import "TZFoundation.h" #import <gtk/gtk.h> -@class MainWindow; +@class Window; @class PickSupport; /** - * Manages the menu and toolbar for the main window. + * Manages the menu */ @interface Menu: NSObject { - MainWindow *mainWindow; + Window *window; GtkUIManager *ui; GtkActionGroup *staticActions; GtkActionGroup *documentActions; @@ -46,25 +42,20 @@ } /** - * Constructs the menu and toolbar for @p window - * - * @param window the mainwindow that will be acted upon by the various - * menu items and toolbar buttons. + * The menubar widget, to be inserted into the window */ -- (id) initForMainWindow:(MainWindow*)window; - +@property (readonly) GtkWidget *menubar; /** - * The menubar widget, to be inserted into the main window + * The window object passed to initForWindow */ -- (GtkWidget*) menubar; -/** - * The toolbar widget, to be inserted into the main window - */ -- (GtkWidget*) toolbar; +@property (readonly) Window *window; + /** - * The main window object passed to initForMainWindow + * Constructs the menu for @p window + * + * @param window the window that will be acted upon */ -- (MainWindow*) mainWindow; +- (id) initForWindow:(Window*)window; /** * Enables or disables the undo action |