summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/graphics/gui/CMakeLists.txt2
-rw-r--r--data/graphics/gui/Makefile.am4
-rw-r--r--data/graphics/gui/window.xml (renamed from data/graphics/gui/gui.xml)0
-rw-r--r--src/gui/widgets/window.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 01b8674f..fc825139 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -9,7 +9,6 @@ SET (FILES
circle-green.png
close_button.png
deepbox.png
- gui.xml
hscroll_left_default.png
hscroll_left_highlight.png
hscroll_left_pressed.png
@@ -48,6 +47,7 @@ SET (FILES
vscroll_up_highlight.png
vscroll_up_pressed.png
window.png
+ window.xml
)
INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/gui)
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index ed48c012..68d11bf7 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -12,7 +12,6 @@ gui_DATA = \
circle-green.png \
close_button.png \
deepbox.png \
- gui.xml \
hscroll_left_default.png \
hscroll_left_highlight.png \
hscroll_left_pressed.png \
@@ -50,7 +49,8 @@ gui_DATA = \
vscroll_up_default.png \
vscroll_up_highlight.png \
vscroll_up_pressed.png \
- window.png
+ window.png \
+ window.xml
EXTRA_DIST = \
$(gui_DATA)
diff --git a/data/graphics/gui/gui.xml b/data/graphics/gui/window.xml
index f27dbc7f..f27dbc7f 100644
--- a/data/graphics/gui/gui.xml
+++ b/data/graphics/gui/window.xml
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index fd7fd6b7..b72be9d4 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -57,7 +57,7 @@ class Window : public gcn::Window, gcn::WidgetListener
* @param skin The location where the window's skin XML can be found.
*/
Window(const std::string &caption = "Window", bool modal = false,
- Window *parent = NULL, const std::string &skin = "gui.xml");
+ Window *parent = NULL, const std::string &skin = "window.xml");
/**
* Destructor. Deletes all the added widgets.