Implement close button.

This commit is contained in:
DarwinNE 2020-01-10 22:27:40 +01:00
parent 5102db592c
commit 187b3af647
2 changed files with 32 additions and 2 deletions

26
IConsole/Makefile Normal file
View File

@ -0,0 +1,26 @@
# path to RETRO68
RETRO68=../../Retro68-build/toolchain
PREFIX=$(RETRO68)/m68k-apple-macos
CC=$(RETRO68)/bin/m68k-apple-macos-gcc
CXX=$(RETRO68)/bin/m68k-apple-macos-g++
REZ=$(RETRO68)/bin/Rez
LDFLAGS=retro/libIConsole.a
RINCLUDES=$(PREFIX)/RIncludes
REZFLAGS=-I$(RINCLUDES)
IConsoleTest.bin IConsoleTest.APPL IConsoleTest.dsk: IConsoleTest.code.bin
$(REZ) $(REZFLAGS) \
--copy "IConsoleTest.code.bin" \
"$(RINCLUDES)/Retro68APPL.r" \
-t "APPL" -c "????" \
-o IConsoleTest.bin --cc IConsoleTest.APPL --cc IConsoleTest.dsk
IConsoleTest.code.bin: IConsoleTest.o
$(CXX) $< -o $@ $(LDFLAGS) # C++ used for linking because RetroConsole needs it
.PHONY: clean
clean:
rm -f IConsoleTest.bin IConsoleTest.APPL IConsoleTest.dsk IConsoleTest.code.bin IConsoleTest.code.bin.gdb IConsoleTest.o

View File

@ -32,7 +32,7 @@ IConsoleWindow::IConsoleWindow(Rect r, ConstStr255Param title)
{
GrafPtr port;
//Retro68 Improved Console
win = NewWindow(NULL, &r, "\pThe Queen's Footsteps", true, 0, (WindowPtr)-1, false, 0);
win = NewWindow(NULL, &r, "\pThe Queen's Footsteps", true, 0, (WindowPtr)-1, true, 0);
#if !TARGET_API_MAC_CARBON
port = win;
@ -105,7 +105,6 @@ char IConsoleWindow::WaitNextChar()
}
break;
case mouseDown:
switch(FindWindow(event.where, &eventWin))
{
case inDrag:
@ -118,6 +117,11 @@ char IConsoleWindow::WaitNextChar()
Reshape(Rect {0, 0, (short) (growResult >> 16), (short) (growResult & 0xFFFF) });
}
break;
case inGoAway:
{
if (TrackGoAway(eventWin,event.where))
exit(0);
}
}
break;
}