Rename src/gui/jwindow.cpp|h to src/gui/frame.cpp|h.

src/commands/cmd_grid.cpp

@@ -20,7 +20,7 @@
 
 #include <allegro/unicode.h>
 
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 
 #include "commands/command.h"
 #include "context.h"

src/commands/fx/cmd_convolution_matrix.cpp

@@ -30,7 +30,7 @@
 #include "gui/jslider.h"
 #include "gui/jview.h"
 #include "gui/jwidget.h"
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 
 #include "app/color.h"
 #include "commands/command.h"

src/commands/fx/cmd_despeckle.cpp

@@ -26,7 +26,7 @@
 #include "gui/jentry.h"
 #include "gui/jhook.h"
 #include "gui/jwidget.h"
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 
 #include "commands/command.h"
 #include "commands/fx/effectbg.h"

src/commands/fx/cmd_invert_color.cpp

@@ -25,7 +25,7 @@
 #include "gui/jlabel.h"
 #include "gui/jslider.h"
 #include "gui/jwidget.h"
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 
 #include "app/color.h"
 #include "commands/command.h"

src/core/drop_files.cpp

@@ -21,7 +21,7 @@
 #include <allegro.h>
 #include <vector>
 
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 
 #include "app.h"
 #include "base/mutex.h"

src/dialogs/maskcol.cpp

@@ -25,7 +25,7 @@
 #include "gui/jlabel.h"
 #include "gui/jslider.h"
 #include "gui/jwidget.h"
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 
 #include "app.h"
 #include "app/color.h"

src/gfxmode.cpp

@@ -21,7 +21,7 @@
 #include <allegro.h>
 
 #include "gui/jmanager.h"
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 
 #include "app.h"
 #include "gfxmode.h"

src/gui/CMakeLists.txt

@@ -4,6 +4,7 @@
 add_library(gui-lib
   component.cpp
   event.cpp
+  frame.cpp
   jaccel.cpp
   jalert.cpp
   jbox.cpp
@@ -43,7 +44,6 @@ add_library(gui-lib
   jtooltips.cpp
   jview.cpp
   jwidget.cpp
-  jwindow.cpp
   preferred_size_event.cpp
   property.cpp
   themes/jstandard_theme.cpp)

src/gui/frame.h

@@ -4,8 +4,8 @@
 // This source file is ditributed under a BSD-like license, please
 // read LICENSE.txt for more information.
 
-#ifndef GUI_JWINDOW_H_INCLUDED
-#define GUI_JWINDOW_H_INCLUDED
+#ifndef GUI_FRAME_H_INCLUDED
+#define GUI_FRAME_H_INCLUDED
 
 #include "base/signal.h"
 #include "gui/jwidget.h"

src/gui/jbutton.cpp

@@ -19,7 +19,7 @@
 #include "gui/jrect.h"
 #include "gui/jtheme.h"
 #include "gui/jwidget.h"
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 #include "gui/preferred_size_event.h"
 
 ButtonBase::ButtonBase(const char* text, int type, int behaviorType, int drawType)

src/gui/jinete.h

@@ -43,6 +43,6 @@
 #include "gui/jtooltips.h"
 #include "gui/jview.h"
 #include "gui/jwidget.h"
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 
 #endif

src/gui/jintern.cpp

@@ -11,7 +11,7 @@
 #include "gui/jmanager.h"
 #include "gui/jtheme.h"
 #include "gui/jwidget.h"
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 
 static std::vector<JWidget>* widgets;
 

src/gui/jpopup_window.h

@@ -7,7 +7,7 @@
 #ifndef GUI_JPOPUP_WINDOW_H_INCLUDED
 #define GUI_JPOPUP_WINDOW_H_INCLUDED
 
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 
 class PopupWindow : public Frame
 {

src/gui/jtooltips.h

@@ -8,7 +8,7 @@
 #define GUI_JTOOLTIPS_H_INCLUDED
 
 #include "gui/jbase.h"
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 
 class TipWindow : public Frame
 {

src/job.cpp

@@ -21,7 +21,7 @@
 #include "gui/jalert.h"
 #include "gui/jthread.h"
 #include "gui/jwidget.h"
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 
 #include "app.h"
 #include "base/mutex.h"

src/widgets/curvedit.cpp

@@ -33,7 +33,7 @@
 #include "gui/jsystem.h"
 #include "gui/jview.h"
 #include "gui/jwidget.h"
-#include "gui/jwindow.h"
+#include "gui/frame.h"
 #include "modules/gui.h"
 #include "widgets/curvedit.h"