diff --git a/src/lib/views/sunlight/Makefile b/src/lib/views/sunlight/Makefile index fee3837..b6e6e85 100644 --- a/src/lib/views/sunlight/Makefile +++ b/src/lib/views/sunlight/Makefile @@ -4,7 +4,7 @@ include ../../../Makefile.inc #Objects -OBJS = sStyle.o vContext.o vButton.o vMenuBar.o vView.o vCanvas.o vDesktop.o +OBJS = sStyle.o vContext.o vButton.o vMenuBar.o vView.o vCanvas.o vDesktop.o vTitleTab.o #Include INCLUDE = -I./ -I../../..lib/libc/include -I../../../lib/libcpp/include -I../../objgfx40/objgfx40 -I./include @@ -17,7 +17,7 @@ # Compile the source files .cpp.o: - $(CXX) -Wall -g -fno-builtin -fno-rtti -fno-exceptions -DNOBOOL $(INCLUDE) -c -o $@ $< + $(CXX) -Wall -g -fno-builtin -fno-exceptions -DNOBOOL $(INCLUDE) -c -o $@ $< .cc.o: $(CXX) -Wall -fomit-frame-pointer -O -nobuilting -I../../lib/libc/include -I./include -S -o $@ $< diff --git a/src/lib/views/sunlight/vTitleTab.cpp b/src/lib/views/sunlight/vTitleTab.cpp index d191bd0..6d8ce77 100644 --- a/src/lib/views/sunlight/vTitleTab.cpp +++ b/src/lib/views/sunlight/vTitleTab.cpp @@ -1,11 +1,15 @@ #include #include #include +#include vTitleTab::vTitleTab(vContext * parent) : vContext(parent) { font = new ogBitFont(); title = ""; - + sString * fontFileName = dynamic_cast(GetStyle("default font")); + if (NULL != fontFileName) { + font->Load(fontFileName->name.c_str(), 0); + } return; } // vTitleTab::vTitleTab