Author: spitzak
Date: 2007-06-27 08:41:26 -0400 (Wed, 27 Jun 2007)
New Revision: 5919
Log:
Fixed non-working code that was accidentally checked in for the OSX version.
Added:
trunk/fltk/compat/FL/Fl_Shared_Image.H
Modified:
trunk/fltk/compat/FL/fl_draw.H
trunk/src/lock.cxx
trunk/src/osx/run.cxx
Added: trunk/fltk/compat/FL/Fl_Shared_Image.H
===================================================================
--- trunk/fltk/compat/FL/Fl_Shared_Image.H (rev 0)
+++ trunk/fltk/compat/FL/Fl_Shared_Image.H 2007-06-27 12:41:26 UTC (rev
5919)
@@ -0,0 +1,8 @@
+#ifndef Fl_Shared_Image_H
+#define Fl_Shared_Image_H
+
+#include <fltk/SharedImage.h>
+#define Fl_Shared_Image fltk::SharedImage
+#define Fl_Image fltk::Image
+
+#endif
Modified: trunk/fltk/compat/FL/fl_draw.H
===================================================================
--- trunk/fltk/compat/FL/fl_draw.H 2007-06-26 18:49:21 UTC (rev 5918)
+++ trunk/fltk/compat/FL/fl_draw.H 2007-06-27 12:41:26 UTC (rev 5919)
@@ -10,6 +10,7 @@
// clip:
inline void fl_push_clip(int x, int y, int w, int h)
{fltk::push_clip(x,y,w,h);}
+inline void fl_push_no_clip() {fltk::push_no_clip();}
#define fl_clip fl_push_clip
#define fl_pop_clip fltk::pop_clip
inline int fl_not_clipped(int x, int y, int w, int h) {return
fltk::not_clipped(fltk::Rectangle(x,y,w,h));}
Modified: trunk/src/lock.cxx
===================================================================
--- trunk/src/lock.cxx 2007-06-26 18:49:21 UTC (rev 5918)
+++ trunk/src/lock.cxx 2007-06-27 12:41:26 UTC (rev 5919)
@@ -213,8 +213,8 @@
static void init_function() {
// Init threads communication pipe to let threads awake FLTK from wait
main_thread_id = pthread_self();
+#if !USE_QUARTZ
pipe(thread_filedes);
-#if !USE_QUARTZ
fcntl(thread_filedes[0], F_SETFL, O_NONBLOCK);
fltk::add_fd(thread_filedes[0], fltk::READ, thread_awake_cb);
#endif
Modified: trunk/src/osx/run.cxx
===================================================================
--- trunk/src/osx/run.cxx 2007-06-26 18:49:21 UTC (rev 5918)
+++ trunk/src/osx/run.cxx 2007-06-27 12:41:26 UTC (rev 5919)
@@ -227,7 +227,7 @@
EventRef drEvent;
CreateEvent( 0, kEventClassFLTK, kEventFLTKDataReady,
0, kEventAttributeUserEvent, &drEvent);
- PostEventToQueue(eventqueue, drEvent, kEventPriorityStandard);
+ PostEventToQueue(GetCurrentEventQueue(), drEvent, kEventPriorityStandard);
}
void* fltk::thread_message() {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
