aboutsummaryrefslogtreecommitdiffstats
path: root/src/gwin
diff options
context:
space:
mode:
Diffstat (limited to 'src/gwin')
-rw-r--r--src/gwin/gwin_button.c (renamed from src/gwin/button.c)4
-rw-r--r--src/gwin/gwin_button.h (renamed from src/gwin/button.h)4
-rw-r--r--src/gwin/gwin_checkbox.c (renamed from src/gwin/checkbox.c)4
-rw-r--r--src/gwin/gwin_checkbox.h (renamed from src/gwin/checkbox.h)4
-rw-r--r--src/gwin/gwin_class.h (renamed from src/gwin/class_gwin.h)4
-rw-r--r--src/gwin/gwin_console.c (renamed from src/gwin/console.c)4
-rw-r--r--src/gwin/gwin_console.h (renamed from src/gwin/console.h)4
-rw-r--r--src/gwin/gwin_container.c (renamed from src/gwin/gcontainer.c)4
-rw-r--r--src/gwin/gwin_container.h (renamed from src/gwin/gcontainer.h)6
-rw-r--r--src/gwin/gwin_frame.c (renamed from src/gwin/frame.c)4
-rw-r--r--src/gwin/gwin_frame.h (renamed from src/gwin/frame.h)4
-rw-r--r--src/gwin/gwin_gl3d.c2
-rw-r--r--src/gwin/gwin_gl3d.h2
-rw-r--r--src/gwin/gwin_graph.c (renamed from src/gwin/graph.c)4
-rw-r--r--src/gwin/gwin_graph.h (renamed from src/gwin/graph.h)4
-rw-r--r--src/gwin/gwin_gwin.c (renamed from src/gwin/gwin.c)7
-rw-r--r--src/gwin/gwin_image.c (renamed from src/gwin/gimage.c)4
-rw-r--r--src/gwin/gwin_image.h (renamed from src/gwin/gimage.h)4
-rw-r--r--src/gwin/gwin_label.c (renamed from src/gwin/label.c)4
-rw-r--r--src/gwin/gwin_label.h (renamed from src/gwin/label.h)4
-rw-r--r--src/gwin/gwin_list.c (renamed from src/gwin/list.c)4
-rw-r--r--src/gwin/gwin_list.h (renamed from src/gwin/list.h)4
-rw-r--r--src/gwin/gwin_progressbar.c (renamed from src/gwin/progressbar.c)4
-rw-r--r--src/gwin/gwin_progressbar.h (renamed from src/gwin/progressbar.h)3
-rw-r--r--src/gwin/gwin_radio.c (renamed from src/gwin/radio.c)4
-rw-r--r--src/gwin/gwin_radio.h (renamed from src/gwin/radio.h)4
-rw-r--r--src/gwin/gwin_slider.c (renamed from src/gwin/slider.c)4
-rw-r--r--src/gwin/gwin_slider.h (renamed from src/gwin/slider.h)4
-rw-r--r--src/gwin/gwin_widget.c (renamed from src/gwin/gwidget.c)7
-rw-r--r--src/gwin/gwin_widget.h (renamed from src/gwin/gwidget.h)18
-rw-r--r--src/gwin/gwin_wm.c (renamed from src/gwin/gwm.c)9
-rw-r--r--src/gwin/sys_defs.h12
-rw-r--r--src/gwin/sys_make.mk30
33 files changed, 103 insertions, 85 deletions
diff --git a/src/gwin/button.c b/src/gwin/gwin_button.c
index 5507a07a..35627cfb 100644
--- a/src/gwin/button.c
+++ b/src/gwin/gwin_button.c
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/button.c
+ * @file src/gwin/gwin_button.c
* @brief GWIN sub-system button code
*/
@@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_BUTTON
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
// Parameters for various shapes
#define RND_CNR_SIZE 5 // Rounded corner size for rounded buttons
diff --git a/src/gwin/button.h b/src/gwin/gwin_button.h
index 5f5d2838..282ed828 100644
--- a/src/gwin/button.h
+++ b/src/gwin/gwin_button.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/button.h
+ * @file src/gwin/gwin_button.h
* @brief GWIN Graphic window subsystem header file.
*
* @defgroup Button Button
@@ -24,7 +24,7 @@
#ifndef _GWIN_BUTTON_H
#define _GWIN_BUTTON_H
-/* This file is included within "gwin/gwidget.h" */
+/* This file is included within "src/gwin/gwin_widget.h" */
/**
* @brief The Event Type for a Button Event
diff --git a/src/gwin/checkbox.c b/src/gwin/gwin_checkbox.c
index 6269acc1..dec085c3 100644
--- a/src/gwin/checkbox.c
+++ b/src/gwin/gwin_checkbox.c
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/checkbox.c
+ * @file src/gwin/gwin_checkbox.c
* @brief GWIN sub-system button code
*/
@@ -14,7 +14,7 @@
#if (GFX_USE_GWIN && GWIN_NEED_CHECKBOX) || defined(__DOXYGEN__)
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
// Our checked state
#define GCHECKBOX_FLG_CHECKED (GWIN_FIRST_CONTROL_FLAG<<0)
diff --git a/src/gwin/checkbox.h b/src/gwin/gwin_checkbox.h
index 3c426242..3a67d487 100644
--- a/src/gwin/checkbox.h
+++ b/src/gwin/gwin_checkbox.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/checkbox.h
+ * @file src/gwin/gwin_checkbox.h
* @brief GWIN Graphic window subsystem header file.
*
* @defgroup Checkbox Checkbox
@@ -22,7 +22,7 @@
#ifndef _GWIN_CHECKBOX_H
#define _GWIN_CHECKBOX_H
-/* This file is included within "gwin/gwidget.h" */
+/* This file is included within "src/gwin/gwin_widget.h" */
/*===========================================================================*/
/* Driver constants. */
diff --git a/src/gwin/class_gwin.h b/src/gwin/gwin_class.h
index e45914a6..4dde3624 100644
--- a/src/gwin/class_gwin.h
+++ b/src/gwin/gwin_class.h
@@ -6,7 +6,7 @@
*/
/*
- * @file src/gwin/class_gwin.h
+ * @file src/gwin/gwin_class.h
* @brief GWIN Graphic window subsystem header file.
*
* @defgroup Internal Internal
@@ -14,7 +14,7 @@
*
* @note These definitions are normally not used by an application program. They are useful
* only if you want to create your own custom GWIN window or widget.
- * @note To access these definitions you must include "gwin/class_gwin.h" in your source file.
+ * @note To access these definitions you must include "src/gwin/gwin_class.h" in your source file.
*
* @{
*/
diff --git a/src/gwin/console.c b/src/gwin/gwin_console.c
index 0380fd61..4c17034d 100644
--- a/src/gwin/console.c
+++ b/src/gwin/gwin_console.c
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/console.c
+ * @file src/gwin/gwin_console.c
* @brief GWIN sub-system console code.
*/
@@ -16,7 +16,7 @@
#include <string.h>
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
#define GWIN_CONSOLE_USE_CLEAR_LINES TRUE // Clear each line before using it
#define GWIN_CONSOLE_USE_FILLED_CHARS FALSE // Use filled characters instead of drawn characters
diff --git a/src/gwin/console.h b/src/gwin/gwin_console.h
index 2a8f4a0a..77e623eb 100644
--- a/src/gwin/console.h
+++ b/src/gwin/gwin_console.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/console.h
+ * @file src/gwin/gwin_console.h
* @brief GWIN Graphic window subsystem header file.
*
* @defgroup Console Console
@@ -24,7 +24,7 @@
#ifndef _GWIN_CONSOLE_H
#define _GWIN_CONSOLE_H
-/* This file is included within "gwin/gwin.h" */
+/* This file is included within "src/gwin/sys_defs.h" */
// A console window. Supports wrapped text writing and a cursor.
typedef struct GConsoleObject {
diff --git a/src/gwin/gcontainer.c b/src/gwin/gwin_container.c
index 97b5fabb..3145ae56 100644
--- a/src/gwin/gcontainer.c
+++ b/src/gwin/gwin_container.c
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/gcontainer.c
+ * @file src/gwin/gwin_container.c
* @brief GWIN sub-system container code
*/
@@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_CONTAINERS
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
void _gcontainerInit(void)
{
diff --git a/src/gwin/gcontainer.h b/src/gwin/gwin_container.h
index 98707ede..ff1c1ce9 100644
--- a/src/gwin/gcontainer.h
+++ b/src/gwin/gwin_container.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/gcontainer.h
+ * @file src/gwin/gwin_container.h
*
* @defgroup Container Container
* @ingroup Containers
@@ -21,7 +21,7 @@
#ifndef _GCONTAINER_H
#define _GCONTAINER_H
-/* This file is included within "gwin/gwin.h" */
+/* This file is included within "src/gwin/sys_defs.h" */
// Forward definition
struct GContainerObject;
@@ -154,7 +154,7 @@ extern "C" {
/* Include extra container types */
#if GWIN_NEED_FRAME || defined(__DOXYGEN__)
- #include "src/gwin/frame.h"
+ #include "gwin_frame.h"
#endif
#endif /* _GCONTAINER_H */
diff --git a/src/gwin/frame.c b/src/gwin/gwin_frame.c
index fd8fafea..63df3be2 100644
--- a/src/gwin/frame.c
+++ b/src/gwin/gwin_frame.c
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/frame.c
+ * @file src/gwin/gwin_frame.c
* @brief GWIN sub-system frame code.
*/
@@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_FRAME
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
/* Some position values */
#define BUTTON_X 18 // Button Width
diff --git a/src/gwin/frame.h b/src/gwin/gwin_frame.h
index 58e1fbc9..f71a88a5 100644
--- a/src/gwin/frame.h
+++ b/src/gwin/gwin_frame.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/frame.h
+ * @file src/gwin/gwin_frame.h
* @brief GWIN Graphic window subsystem header file.
*
* @defgroup Frame Frame
@@ -23,6 +23,8 @@
#ifndef _GWIN_FRAME_H
#define _GWIN_FRAME_H
+/* This file is included from src/gwin/gwin_container.h */
+
/**
* @brief Flags for gwinFrameCreate()
* @{
diff --git a/src/gwin/gwin_gl3d.c b/src/gwin/gwin_gl3d.c
index e04875c0..6e16479e 100644
--- a/src/gwin/gwin_gl3d.c
+++ b/src/gwin/gwin_gl3d.c
@@ -18,7 +18,7 @@
#error "GWIN: GL3D only support GDISP_PIXELFORMAT_RGB565 color format (TinyGL limitation)"
#endif
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
#include "3rdparty/tinygl-0.4-ugfx/src/zgl.h"
diff --git a/src/gwin/gwin_gl3d.h b/src/gwin/gwin_gl3d.h
index ca3edf6f..644f45bf 100644
--- a/src/gwin/gwin_gl3d.h
+++ b/src/gwin/gwin_gl3d.h
@@ -22,7 +22,7 @@
#ifndef _GWIN_GL3D_H
#define _GWIN_GL3D_H
-/* This file is included within "gwin/gwin.h" */
+/* This file is included within "src/gwin/sys_defs.h" */
// A gl3d window
diff --git a/src/gwin/graph.c b/src/gwin/gwin_graph.c
index 4fcfad37..8a450a9f 100644
--- a/src/gwin/graph.c
+++ b/src/gwin/gwin_graph.c
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/graph.c
+ * @file src/gwin/gwin_graph.c
* @brief GWIN sub-system button code
*/
@@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_GRAPH
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
#define GGRAPH_FLG_CONNECTPOINTS (GWIN_FIRST_CONTROL_FLAG<<0)
#define GGRAPH_ARROW_SIZE 5
diff --git a/src/gwin/graph.h b/src/gwin/gwin_graph.h
index be51f66c..eea80679 100644
--- a/src/gwin/graph.h
+++ b/src/gwin/gwin_graph.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/graph.h
+ * @file src/gwin/gwin_graph.h
* @brief GWIN GRAPH module header file
*
* @defgroup Graph Graph
@@ -22,7 +22,7 @@
#ifndef _GWIN_GRAPH_H
#define _GWIN_GRAPH_H
-/* This file is included within "gwin/gwin.h" */
+/* This file is included within "src/gwin/sys_defs.h" */
typedef enum GGraphPointType_e {
GGRAPH_POINT_NONE, GGRAPH_POINT_DOT, GGRAPH_POINT_SQUARE, GGRAPH_POINT_CIRCLE
diff --git a/src/gwin/gwin.c b/src/gwin/gwin_gwin.c
index b5b7ad6b..a4cef125 100644
--- a/src/gwin/gwin.c
+++ b/src/gwin/gwin_gwin.c
@@ -5,11 +5,16 @@
* http://ugfx.org/license.html
*/
+/**
+ * @file src/gwin/gwin_gwin.c
+ * @brief GWIN sub-system code
+ */
+
#include "gfx.h"
#if GFX_USE_GWIN
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
/*-----------------------------------------------
* Data
diff --git a/src/gwin/gimage.c b/src/gwin/gwin_image.c
index d5ca2c38..370d7bdd 100644
--- a/src/gwin/gimage.c
+++ b/src/gwin/gwin_image.c
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/gimage.c
+ * @file src/gwin/gwin_image.c
* @brief GWIN sub-system image code
*/
@@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_IMAGE
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
#define widget(gh) ((GImageObject *)gh)
diff --git a/src/gwin/gimage.h b/src/gwin/gwin_image.h
index 0052f024..2e0a3218 100644
--- a/src/gwin/gimage.h
+++ b/src/gwin/gwin_image.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/gimage.h
+ * @file src/gwin/gwin_image.h
* @brief GWIN image widget header file.
*
* @defgroup ImageBox ImageBox
@@ -27,7 +27,7 @@
#ifndef _GWIN_IMAGE_H
#define _GWIN_IMAGE_H
-// This file is included within "gwin/gwin.h"
+// This file is included within "src/gwin/sys_defs.h"
// An image window
typedef struct GImageObject {
diff --git a/src/gwin/label.c b/src/gwin/gwin_label.c
index 4faba95c..3be9d0a9 100644
--- a/src/gwin/label.c
+++ b/src/gwin/gwin_label.c
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/label.c
+ * @file src/gwin/gwin_label.c
* @brief GWIN label widget header file
*/
@@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_LABEL
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
// macros to assist in data type conversions
#define gh2obj ((GLabelObject *)gh)
diff --git a/src/gwin/label.h b/src/gwin/gwin_label.h
index e0b32240..b5c45589 100644
--- a/src/gwin/label.h
+++ b/src/gwin/gwin_label.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/label.h
+ * @file src/gwin/gwin_label.h
* @brief GWIN label widget header file
*
* @defgroup Label Label
@@ -27,7 +27,7 @@
#ifndef _GWIN_LABEL_H
#define _GWIN_LABEL_H
-// This file is included within "gwin/gwin.h"
+// This file is included within "src/gwin/gwin_widget.h"
// An label window
typedef struct GLabelObject {
diff --git a/src/gwin/list.c b/src/gwin/gwin_list.c
index 10926238..265053e1 100644
--- a/src/gwin/list.c
+++ b/src/gwin/gwin_list.c
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/list.c
+ * @file src/gwin/gwin_list.c
* @brief GWIN list widget header file
*/
@@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_LIST
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
#include <string.h>
#include <stdlib.h>
diff --git a/src/gwin/list.h b/src/gwin/gwin_list.h
index d9979993..a55d4cb8 100644
--- a/src/gwin/list.h
+++ b/src/gwin/gwin_list.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/list.h
+ * @file src/gwin/gwin_list.h
* @brief GWIN list widget header file
*
* @defgroup List List
@@ -26,7 +26,7 @@
#ifndef _GWIN_LIST_H
#define _GWIN_LIST_H
-// This file is included within "gwin/gwin.h"
+// This file is included within "src/gwin/gwin_widget.h"
/**
* @brief The event type for a list event
diff --git a/src/gwin/progressbar.c b/src/gwin/gwin_progressbar.c
index 90be6e43..ef28e8dc 100644
--- a/src/gwin/progressbar.c
+++ b/src/gwin/gwin_progressbar.c
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/progressbar.c
+ * @file src/gwin/gwin_progressbar.c
* @brief GWIN sub-system progressbar code
*/
@@ -14,7 +14,7 @@
#if (GFX_USE_GWIN && GWIN_NEED_PROGRESSBAR) || defined(__DOXYGEN__)
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
// Reset the display position back to the value predicted by the saved progressbar position
static void ResetDisplayPos(GProgressbarObject *gsw) {
diff --git a/src/gwin/progressbar.h b/src/gwin/gwin_progressbar.h
index 4dadf904..49c11a98 100644
--- a/src/gwin/progressbar.h
+++ b/src/gwin/gwin_progressbar.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/progressbar.h
+ * @file src/gwin/gwin_progressbar.h
* @brief GWIN Graphic window subsystem header file.
*
* @defgroup Progressbar Progressbar
@@ -22,6 +22,7 @@
#ifndef _GWIN_PROGRESSBAR_H
#define _GWIN_PROGRESSBAR_H
+/* This file is included within src/gwin/gwin_widget.h */
// A progressbar window
typedef struct GProgressbarObject {
GWidgetObject w;
diff --git a/src/gwin/radio.c b/src/gwin/gwin_radio.c
index 4799c2a4..0bafa7cc 100644
--- a/src/gwin/radio.c
+++ b/src/gwin/gwin_radio.c
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/radio.c
+ * @file src/gwin/gwin_radio.c
* @brief GWIN sub-system radio button code
*/
@@ -14,7 +14,7 @@
#if GFX_USE_GWIN && GWIN_NEED_RADIO
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
#define GRADIO_TAB_CNR 8 // Diagonal corner on active tab
#define GRADIO_TOP_FADE 50 // (GRADIO_TOP_FADE/255)% fade to white for top of tab/button
diff --git a/src/gwin/radio.h b/src/gwin/gwin_radio.h
index e13962c7..d5c9c21a 100644
--- a/src/gwin/radio.h
+++ b/src/gwin/gwin_radio.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/radio.h
+ * @file src/gwin/gwin_radio.h
* @brief GWIN Graphic window subsystem header file.
*
* @defgroup RadioButton RadioButton
@@ -22,7 +22,7 @@
#ifndef _GWIN_RADIO_H
#define _GWIN_RADIO_H
-/* This file is included within "gwin/gwidget.h" */
+/* This file is included within "src/gwin/gwin_widget.h" */
/**
* @brief The Event Type for a Radio Event
diff --git a/src/gwin/slider.c b/src/gwin/gwin_slider.c
index 2329230c..f1230d5a 100644
--- a/src/gwin/slider.c
+++ b/src/gwin/gwin_slider.c
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/slider.c
+ * @file src/gwin/gwin_slider.c
* @brief GWIN sub-system slider code
*/
@@ -14,7 +14,7 @@
#if (GFX_USE_GWIN && GWIN_NEED_SLIDER) || defined(__DOXYGEN__)
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
#ifndef GWIN_SLIDER_DEAD_BAND
#define GWIN_SLIDER_DEAD_BAND 5
diff --git a/src/gwin/slider.h b/src/gwin/gwin_slider.h
index 6cd8088b..b88d6dfd 100644
--- a/src/gwin/slider.h
+++ b/src/gwin/gwin_slider.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/slider.h
+ * @file src/gwin/gwin_slider.h
* @brief GWIN Graphic window subsystem header file.
*
* @defgroup Slider Slider
@@ -22,7 +22,7 @@
#ifndef _GWIN_SLIDER_H
#define _GWIN_SLIDER_H
-/* This file is included within "gwin/gwidget.h" */
+/* This file is included within "src/gwin/gwin_widget.h" */
#define GEVENT_GWIN_SLIDER (GEVENT_GWIN_CTRL_FIRST+1)
diff --git a/src/gwin/gwidget.c b/src/gwin/gwin_widget.c
index e773dc6c..f85e6f20 100644
--- a/src/gwin/gwidget.c
+++ b/src/gwin/gwin_widget.c
@@ -5,13 +5,18 @@
* http://ugfx.org/license.html
*/
+/**
+ * @file src/gwin/gwin_widget.c
+ * @brief GWIN sub-system widget code
+ */
+
#include "gfx.h"
#if GFX_USE_GWIN && GWIN_NEED_WIDGET
#include <string.h>
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
/* Our listener for events for widgets */
static GListener gl;
diff --git a/src/gwin/gwidget.h b/src/gwin/gwin_widget.h
index 18b42b79..81c76263 100644
--- a/src/gwin/gwidget.h
+++ b/src/gwin/gwin_widget.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gwin/gwidget.h
+ * @file src/gwin/gwin_widget.h
* @brief GWIN Widgets header file.
*
* @defgroup Widget Widget
@@ -23,7 +23,7 @@
#ifndef _GWIDGET_H
#define _GWIDGET_H
-/* This file is included within "gwin/gwin.h" */
+/* This file is included within "src/gwin/sys_defs.h" */
// Forward definition
struct GWidgetObject;
@@ -360,31 +360,31 @@ bool_t gwinAttachListener(GListener *pl);
/* Include extra widget types */
#if GWIN_NEED_BUTTON || defined(__DOXYGEN__)
- #include "src/gwin/button.h"
+ #include "gwin_button.h"
#endif
#if GWIN_NEED_SLIDER || defined(__DOXYGEN__)
- #include "src/gwin/slider.h"
+ #include "gwin_slider.h"
#endif
#if GWIN_NEED_CHECKBOX || defined(__DOXYGEN__)
- #include "src/gwin/checkbox.h"
+ #include "gwin_checkbox.h"
#endif
#if GWIN_NEED_RADIO || defined(__DOXYGEN__)
- #include "src/gwin/radio.h"
+ #include "gwin_radio.h"
#endif
#if GWIN_NEED_LABEL || defined(__DOXYGEN__)
- #include "src/gwin/label.h"
+ #include "gwin_label.h"
#endif
#if GWIN_NEED_LIST || defined(__DOXYGEN__)
- #include "src/gwin/list.h"
+ #include "gwin_list.h"
#endif
#if GWIN_NEED_PROGRESSBAR || defined(__DOXYGEN__)
- #include "src/gwin/progressbar.h"
+ #include "gwin_progressbar.h"
#endif
#endif /* _GWIDGET_H */
diff --git a/src/gwin/gwm.c b/src/gwin/gwin_wm.c
index ba7a132a..92d68c7b 100644
--- a/src/gwin/gwm.c
+++ b/src/gwin/gwin_wm.c
@@ -5,6 +5,11 @@
* http://ugfx.org/license.html
*/
+/**
+ * @file src/gwin/gwin_wm.c
+ * @brief GWIN sub-system window manager code
+ */
+
#include "gfx.h"
#if GFX_USE_GWIN && !GWIN_NEED_WINDOWMANAGER
@@ -13,7 +18,7 @@
*/
- #include "src/gwin/class_gwin.h"
+ #include "gwin_class.h"
// Needed if there is no window manager
#define MIN_WIN_WIDTH 1
@@ -147,7 +152,7 @@
#if GFX_USE_GWIN && GWIN_NEED_WINDOWMANAGER
-#include "src/gwin/class_gwin.h"
+#include "gwin_class.h"
/*-----------------------------------------------
* Data
diff --git a/src/gwin/sys_defs.h b/src/gwin/sys_defs.h
index 7823eafe..5e08f7a2 100644
--- a/src/gwin/sys_defs.h
+++ b/src/gwin/sys_defs.h
@@ -950,26 +950,26 @@ extern "C" {
/* Include widgets */
#if GWIN_NEED_WIDGET || defined(__DOXYGEN__)
- #include "src/gwin/gwidget.h"
+ #include "gwin_widget.h"
#endif
/* Include containers */
#if GWIN_NEED_CONTAINERS || defined(__DOXYGEN__)
- #include "src/gwin/gcontainer.h"
+ #include "gwin_container.h"
#endif
/* Include vanilla window objects */
#if GWIN_NEED_CONSOLE || defined(__DOXYGEN__)
- #include "src/gwin/console.h"
+ #include "gwin_console.h"
#endif
#if GWIN_NEED_GRAPH || defined(__DOXYGEN__)
- #include "src/gwin/graph.h"
+ #include "gwin_graph.h"
#endif
#if GWIN_NEED_IMAGE || defined(__DOXYGEN__)
- #include "src/gwin/gimage.h"
+ #include "gwin_image.h"
#endif
#if GWIN_NEED_GL3D || defined(__DOXYGEN__)
- #include "src/gwin/gwin_gl3d.h"
+ #include "gwin_gl3d.h"
#endif
#endif /* GFX_USE_GWIN */
diff --git a/src/gwin/sys_make.mk b/src/gwin/sys_make.mk
index f905f8d3..81277a4e 100644
--- a/src/gwin/sys_make.mk
+++ b/src/gwin/sys_make.mk
@@ -1,18 +1,18 @@
-GFXSRC += $(GFXLIB)/src/gwin/gwin.c \
- $(GFXLIB)/src/gwin/gwidget.c \
- $(GFXLIB)/src/gwin/gwm.c \
- $(GFXLIB)/src/gwin/console.c \
- $(GFXLIB)/src/gwin/graph.c \
- $(GFXLIB)/src/gwin/button.c \
- $(GFXLIB)/src/gwin/slider.c \
- $(GFXLIB)/src/gwin/checkbox.c \
- $(GFXLIB)/src/gwin/gimage.c \
- $(GFXLIB)/src/gwin/label.c \
- $(GFXLIB)/src/gwin/radio.c \
- $(GFXLIB)/src/gwin/list.c \
- $(GFXLIB)/src/gwin/progressbar.c \
- $(GFXLIB)/src/gwin/gcontainer.c \
- $(GFXLIB)/src/gwin/frame.c \
+GFXSRC += $(GFXLIB)/src/gwin/gwin_gwin.c \
+ $(GFXLIB)/src/gwin/gwin_widget.c \
+ $(GFXLIB)/src/gwin/gwin_wm.c \
+ $(GFXLIB)/src/gwin/gwin_console.c \
+ $(GFXLIB)/src/gwin/gwin_graph.c \
+ $(GFXLIB)/src/gwin/gwin_button.c \
+ $(GFXLIB)/src/gwin/gwin_slider.c \
+ $(GFXLIB)/src/gwin/gwin_checkbox.c \
+ $(GFXLIB)/src/gwin/gwin_image.c \
+ $(GFXLIB)/src/gwin/gwin_label.c \
+ $(GFXLIB)/src/gwin/gwin_radio.c \
+ $(GFXLIB)/src/gwin/gwin_list.c \
+ $(GFXLIB)/src/gwin/gwin_progressbar.c \
+ $(GFXLIB)/src/gwin/gwin_container.c \
+ $(GFXLIB)/src/gwin/gwin_frame.c \
$(GFXLIB)/src/gwin/gwin_gl3d.c \
GFXINC += $(GFXLIB)/3rdparty/tinygl-0.4-ugfx/include
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-10 21:23:17 +0000