github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

rainbow: some small fixes, SDLFb first shot..

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3607 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
kohait 2011-07-04 21:21:17 +00:00
commit 82e771a69d
28 changed files with 565 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rainbow/Framebuffer/DnD.cpp
View file

@ -19,7 +19,7 @@ Image MakeDragImage(const Image& arrow, Image sample);
Image MakeDragImage(const Image& arrow, const Image& arrow98, Image sample)
{
#if PLATFORM_WIN32
#ifdef PLATFORM_WIN32
if(IsWin2K())
return MakeDragImage(arrow, sample);
else

5
rainbow/Framebuffer/Framebuffer.h
View file

@ -136,9 +136,4 @@ public:
END_UPP_NAMESPACE
#ifndef PLATFORM_WIN32
#include <CtrlCore/stdids.h>
#include "vkcodes.h" //FIXME
#endif
#define GUIPLATFORM_INCLUDE_AFTER <Framebuffer/After.h>

4
rainbow/Framebuffer/Wnd.cpp
View file

@ -227,7 +227,7 @@ bool Ctrl::ProcessEvents(bool *quit)
SweepMkImageCache();
DoPaint(invalid);
invalid.Clear();
return false;
return true;
}
void Ctrl::EventLoop0(Ctrl *ctrl)
@ -246,7 +246,7 @@ void Ctrl::EventLoop0(Ctrl *ctrl)
bool quit = false;
ProcessEvents(&quit);
while(!FBEndSession() && !quit && ctrl ? ctrl->IsOpen() && ctrl->InLoop() : GetTopCtrls().GetCount())
while(!FBEndSession() && !quit && (ctrl ? ctrl->IsOpen() && ctrl->InLoop() : GetTopCtrls().GetCount()))
{
// LLOG(GetSysTime() << " % " << (unsigned)msecs() % 10000 << ": EventLoop / GuiSleep");
SyncCaret();