From 671ef36117d2150c0488e88cfd439e857a88196c Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 28 Apr 2005 17:48:04 +0000 Subject: Fix MacOS X 10.4 compile issues. configure.in: - 10.4 doesn't include libsupc++.a, so we need to use g++ when compiling. src/Fl_Help_View.cxx: - Fl_Help_View::format_table(): missing initialization of font and fsize. src/Fl_Text_Buffer.cxx: - Fl_Text_Buffer::remove_rectangle(): missing initialization of endOffset. src/Fl_Gl_Window.cxx: - Fl_Gl_Window::flush(): use 0xff instead of ~0 for clear_damage() call. test/keyboard.cxx: - Apparently unnamed structs are not supported by Apple's GCC 4.0... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4301 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Gl_Window.cxx | 2 +- src/Fl_Help_View.cxx | 2 ++ src/Fl_Text_Buffer.cxx | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index a20507af5..3c9d2178f 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -329,7 +329,7 @@ void Fl_Gl_Window::flush() { } else { damage1_ = damage(); - clear_damage(~0); draw(); + clear_damage(0xff); draw(); swap_buffers(); } diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 9e3cea8df..b6f499a6a 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -1633,6 +1633,8 @@ Fl_Help_View::format_table(int *table_width, // O - Total table width max_width = 0; pre = 0; needspace = 0; + font = fonts_[nfonts_][0]; + fsize = fonts_[nfonts_][1]; // Scan the table... for (ptr = table, column = -1, width = 0, s = buf, incell = 0; *ptr;) diff --git a/src/Fl_Text_Buffer.cxx b/src/Fl_Text_Buffer.cxx index 93f60276e..7495be19a 100644 --- a/src/Fl_Text_Buffer.cxx +++ b/src/Fl_Text_Buffer.cxx @@ -1540,6 +1540,7 @@ void Fl_Text_Buffer::remove_rectangular_( int start, int end, int rectStart, the text between rectStart and rectEnd and padding appropriately */ lineStart = start; outPtr = outStr; + endOffset = 0; while ( lineStart <= mLength && lineStart <= end ) { lineEnd = line_end( lineStart ); line = text_range( lineStart, lineEnd ); -- cgit v1.2.3