diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2006-04-24 04:06:25 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2006-04-24 04:06:25 +0000 |
| commit | f18ccb4969b7f084d27c68e49feb084ce1434a8c (patch) | |
| tree | 1f99aa70f901601384805b7508d5e9f380b9ea89 /src | |
| parent | Move contextual info to Stack (diff) | |
| download | inkscape-f18ccb4969b7f084d27c68e49feb084ce1434a8c.tar.gz inkscape-f18ccb4969b7f084d27c68e49feb084ce1434a8c.zip | |
moved and renamed object-ui.h and object-ui.cpp to src/ui/context-menu.cpp & context-menu.h, also updated make_insert with change
(bzr r579)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile_insert | 3 | ||||
| -rw-r--r-- | src/doxygen-main.cpp | 2 | ||||
| -rw-r--r-- | src/interface.cpp | 2 | ||||
| -rw-r--r-- | src/make.files | 4 | ||||
| -rw-r--r-- | src/ui/context-menu.cpp (renamed from src/object-ui.cpp) | 6 | ||||
| -rw-r--r-- | src/ui/context-menu.h (renamed from src/object-ui.h) | 4 |
6 files changed, 11 insertions, 10 deletions
diff --git a/src/Makefile_insert b/src/Makefile_insert index 12b766bb3..ce0007a15 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -95,7 +95,8 @@ libinkpre_a_SOURCES = \ nodepath.cpp nodepath.h \ object-edit.cpp object-edit.h \ object-hierarchy.cpp object-hierarchy.h \ - object-ui.cpp object-ui.h \ + ui/context-menu.cpp \ + ui/context-menu.h \ path-chemistry.cpp path-chemistry.h \ path-prefix.h \ pen-context.cpp \ diff --git a/src/doxygen-main.cpp b/src/doxygen-main.cpp index 368346386..f6d5e81f8 100644 --- a/src/doxygen-main.cpp +++ b/src/doxygen-main.cpp @@ -168,7 +168,7 @@ * [\ref help.cpp] [\ref inkscape.cpp] [\ref inkscape-stock.cpp] * [\ref interface.cpp, \ref memeq.h] [\ref main.cpp, \ref winmain.cpp] * [\ref menus-skeleton.h, \ref preferences-skeleton.h] - * [\ref object-ui.cpp] [\ref select-toolbar.cpp] [\ref shortcuts.cpp] + * [\ref context-menu.cpp] [\ref select-toolbar.cpp] [\ref shortcuts.cpp] * [\ref sp-cursor.cpp] [\ref text-edit.cpp] [\ref toolbox.cpp, \ref ui/widget/toolbox.cpp] * Inkscape::Verb [\ref verbs.h] * diff --git a/src/interface.cpp b/src/interface.cpp index 2a2cba4d0..1c7baf413 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -33,7 +33,7 @@ #include "file.h" #include "interface.h" #include "desktop.h" -#include "object-ui.h" +#include "ui/context-menu.h" #include "selection.h" #include "selection-chemistry.h" #include "svg-view-widget.h" diff --git a/src/make.files b/src/make.files index b96325a2c..389acad64 100644 --- a/src/make.files +++ b/src/make.files @@ -835,8 +835,6 @@ object-hierarchy.cpp object-hierarchy.h object-snapper.cpp object-snapper.h -object-ui.cpp -object-ui.h path-chemistry.cpp path-chemistry.h path-prefix.h @@ -1174,6 +1172,8 @@ ui/dialog/whiteboard-sharewithchat.h ui/dialog/whiteboard-sharewithuser.h ui/dialog/xml-editor.cpp ui/dialog/xml-editor.h +ui/context-menu.cpp +ui/context-menu.h ui/icons.cpp ui/icons.h ui/previewable.h diff --git a/src/object-ui.cpp b/src/ui/context-menu.cpp index 23c9ece5b..a86ce2ddc 100644 --- a/src/object-ui.cpp +++ b/src/ui/context-menu.cpp @@ -1,4 +1,4 @@ -#define __SP_OBJECT_UI_C__ +#define __CONTEXT_MENU_C__ /* * Unser-interface related object extension @@ -13,8 +13,8 @@ # include "config.h" #endif -#include "object-ui.h" -#include "xml/repr.h" +#include "context-menu.h" +#include "../xml/repr.h" static void sp_object_type_menu(GType type, SPObject *object, SPDesktop *desktop, GtkMenu *menu); diff --git a/src/object-ui.h b/src/ui/context-menu.h index 3624b4d2e..571698fd2 100644 --- a/src/object-ui.h +++ b/src/ui/context-menu.h @@ -1,5 +1,5 @@ -#ifndef __SP_OBJECT_UI_H__ -#define __SP_OBJECT_UI_H__ +#ifndef __CONTEXT_MENU_H__ +#define __CONTEXT_MENU_H__ /* * Unser-interface related object extension |