nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2026-01-03 16:10:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@236 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-10-09 05:35:02 +00:00
parent 69517263b0
commit 942dcde017
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@@ -28,7 +28,7 @@ L_LIBS = $(LIBS)
L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/font.o src/boldfont.o src/error.o
L_OBJS += src/external/ds.o src/external/image.o
L_OBJS += src/widget/window.o src/widget/button.o src/widget/frame.o src/widget/menu.o src/widget/submenu.o src/widget/image.o src/widget/scrollbar.o src/widget/checkbox.o src/widget/label.o src/widget/text.o
L_OBJS += src/widget/window.o src/widget/button.o src/widget/frame.o src/widget/menu.o src/widget/submenu.o src/widget/image.o src/widget/scrollbar.o src/widget/checkbox.o src/widget/label.o src/widget/entry.o
L_OBJS += src/cursor/default.o src/cursor/cross.o src/cursor/text.o
OOL_CXXFLAGS = $(DEPINC) $(CFLAGS) -std=c++98 -fPIC

4
NTMakefile
View File

@@ -2,8 +2,8 @@
CC = cl
LD = link
OBJS = src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\font.obj src\boldfont.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\submenu.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\text.obj src\external\ds.obj src\external\image.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\backend\gdi.obj
OOOBJS = oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj oosrc\widget\checkbox.obj oosrc\widget\text.obj oosrc\widget\label.obj
OBJS = src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\font.obj src\boldfont.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\submenu.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\entry.obj src\external\ds.obj src\external\image.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\backend\gdi.obj
OOOBJS = oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj oosrc\widget\checkbox.obj oosrc\widget\text.obj oosrc\widget\label.obj oosrc\widget\entry.obj
CFLAGS = /nologo /DSTBI_NO_SIMD /D_MILSKO /DUSE_GDI /DUSE_STB_IMAGE /Iinclude
CXXFLAGS = /nologo /Iinclude
LDFLAGS = /nologo /DLL /LIBPATH:src /LIBPATH:oosrc

2
include/Mw/Milsko.h
View File

@@ -26,7 +26,7 @@
#include <Mw/Widget/CheckBox.h>
#include <Mw/Widget/Frame.h>
#include <Mw/Widget/Image.h>
#include <Mw/Widget/Text.h>
#include <Mw/Widget/Entry.h>
#include <Mw/Widget/ScrollBar.h>
#endif

12
include/Mw/Widget/Text.h → include/Mw/Widget/Entry.h
View File

@@ -1,11 +1,11 @@
/* $Id$ */
/*!
* %file Mw/Widget/Text.h
* %brief Text widget
* %file Mw/Widget/Entry.h
* %brief Entry widget
* %prop MwNtext
*/
#ifndef __MW_WIDGET_TEXT_H__
#define __MW_WIDGET_TEXT_H__
#ifndef __MW_WIDGET_ENTRY_H__
#define __MW_WIDGET_ENTRY_H__
#include <Mw/MachDep.h>
#include <Mw/TypeDefs.h>
@@ -15,9 +15,9 @@ extern "C" {
#endif
/*!
* %brief Text widget class
* %brief Entry widget class
*/
MWDECL MwClass MwTextClass;
MWDECL MwClass MwEntryClass;
#ifdef __cplusplus
}

8
include/MwOO/Widget/Text.h → include/MwOO/Widget/Entry.h
View File

@@ -1,13 +1,13 @@
/* $Id$ */
#ifndef __MWOO_WIDGET_TEXT_H__
#define __MWOO_WIDGET_TEXT_H__
#ifndef __MWOO_WIDGET_ENTRY_H__
#define __MWOO_WIDGET_ENTRY_H__
#include <MwOO/Base.h>
namespace MwOO {
class Text : public MwOO::Base {
class Entry : public MwOO::Base {
public:
Text(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h);
Entry(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h);
void SetText(const char* value);
const char* GetText(void);
void SetBackground(const char* value);

2
oosrc/deps.mk
View File

@@ -1,2 +1,2 @@
# $Id$
OOL_OBJS += oosrc/widget/button.o oosrc/widget/frame.o oosrc/widget/image.o oosrc/widget/menu.o oosrc/widget/scrollbar.o oosrc/widget/submenu.o oosrc/widget/window.o oosrc/widget/checkbox.o oosrc/widget/label.o oosrc/widget/text.o
OOL_OBJS += oosrc/widget/button.o oosrc/widget/frame.o oosrc/widget/image.o oosrc/widget/menu.o oosrc/widget/scrollbar.o oosrc/widget/submenu.o oosrc/widget/window.o oosrc/widget/checkbox.o oosrc/widget/label.o oosrc/widget/entry.o

4
src/widget/text.c → src/widget/entry.c
View File

@@ -127,7 +127,7 @@ static void key(MwWidget handle, int code) {
MwForceRender(handle);
}
MwClassRec MwTextClassRec = {
MwClassRec MwEntryClassRec = {
create, /* create */
destroy, /* destroy */
draw, /* draw */
@@ -143,4 +143,4 @@ MwClassRec MwTextClassRec = {
NULL,
NULL,
NULL};
MwClass MwTextClass = &MwTextClassRec;
MwClass MwEntryClass = &MwEntryClassRec;