diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-02-13 12:57:00 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-02-13 12:57:00 +0000 |
| commit | 5d1df0e789c794b8040c5db0d84b03ae2b42fd8d (patch) | |
| tree | 4e99ebb978d30bf6c7138181489dd37ce435c310 /src/Fl_Text_Display.cxx | |
| parent | 8deac1e6baf7a016aabd3b6cb5ccffd7f09263cd (diff) | |
Details on PORTME items. Move fl_parse_color() to screen drivers.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11163 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Text_Display.cxx')
| -rw-r--r-- | src/Fl_Text_Display.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index 208b41bab..5298e796e 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -31,7 +31,7 @@ #include <FL/Fl_Text_Display.H> #include <FL/Fl_Window.H> -#if defined(WIN32) || defined(__APPLE__) // PORTME: platform editor feel +#if defined(WIN32) || defined(__APPLE__) // PORTME: Fl_Screen_Driver - platform editor feel #elif defined(FL_PORTING) # pragma message "FL_PORTING: look out for some code that visualizes character composing" #else @@ -2144,7 +2144,7 @@ void Fl_Text_Display::draw_string(int style, if (style & PRIMARY_MASK) { if (Fl::focus() == (Fl_Widget*)this) { -#ifdef __APPLE__ // PORTME: platform compose +#ifdef __APPLE__ // PORTME: Fl_Screen_Driver - platform compose if (Fl::compose_state) background = color();// Mac OS: underline marked text else #endif @@ -2181,7 +2181,7 @@ void Fl_Text_Display::draw_string(int style, if (!(style & BG_ONLY_MASK)) { fl_color( foreground ); fl_font( font, fsize ); -#if !(defined(__APPLE__) || defined(WIN32)) && USE_XFT // PORTME: platform editor feel +#if !(defined(__APPLE__) || defined(WIN32)) && USE_XFT // PORTME: Fl_Graphics_Driver - platform editor feel (fix this: fonts should not leak!) // makes sure antialiased ÄÖÜ do not leak on line above fl_push_clip(X, Y, toX - X, mMaxsize); #endif @@ -2277,7 +2277,7 @@ void Fl_Text_Display::draw_cursor( int X, int Y ) { if ( X < text_area.x - 1 || X > text_area.x + text_area.w ) return; -#ifdef __APPLE__ // PORTME: platform compose +#ifdef __APPLE__ // PORTME: Fl_Screen_Driver - platform compose Fl::insertion_point_location(X, bot, fontHeight); #endif /* For cursors other than the block, make them around 2/3 of a character @@ -3703,7 +3703,7 @@ void Fl_Text_Display::draw(void) { int has_selection = buffer()->selection_position(&start, &end); if (damage() & (FL_DAMAGE_ALL | FL_DAMAGE_SCROLL | FL_DAMAGE_EXPOSE) && ( -#ifdef __APPLE__ // PORTME: platform compose +#ifdef __APPLE__ // PORTME: Fl_Screen_Driver - platform compose Fl::compose_state || #endif !has_selection || mCursorPos < start || mCursorPos > end) && @@ -3881,7 +3881,7 @@ int Fl_Text_Display::handle(int event) { if (dragType==DRAG_START_DND) { if (!Fl::event_is_click() && Fl::dnd_text_ops()) { const char* copy = buffer()->selection_text(); -#ifdef __APPLE__ // PORTME: platform compose +#ifdef __APPLE__ // PORTME: Fl_Screen_Driver - platform behavior Fl_X::dnd(1); #else Fl::dnd(); |