diff options
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/Fl_Gl_Window.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_Help_View.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_Text_Buffer.cxx | 1 | ||||
| -rw-r--r-- | test/keyboard.cxx | 2 |
5 files changed, 8 insertions, 3 deletions
diff --git a/configure.in b/configure.in index c894cf671..7c6aaf855 100644 --- a/configure.in +++ b/configure.in @@ -754,7 +754,9 @@ if test -n "$GCC"; then ;; esac - CXX="$CC" + if test x$uname != xDarwin; then + CXX="$CC" + fi # Show all standard warnings + unused variables, conversion errors, # and inlining problems when compiling... 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 ); diff --git a/test/keyboard.cxx b/test/keyboard.cxx index c99fe2010..24801f5b2 100644 --- a/test/keyboard.cxx +++ b/test/keyboard.cxx @@ -62,7 +62,7 @@ int MyWindow::handle(int msg) { return 0; } -struct {int n; const char* text;} table[] = { +struct keycode_table{int n; const char* text;} table[] = { {FL_Escape, "FL_Escape"}, {FL_BackSpace, "FL_BackSpace"}, {FL_Tab, "FL_Tab"}, |