diff options
33 files changed, 110 insertions, 78 deletions
diff --git a/src/Fl_Gl_Window_Driver.H b/src/Fl_Gl_Window_Driver.H index ae2c66ff2..e123c177a 100644 --- a/src/Fl_Gl_Window_Driver.H +++ b/src/Fl_Gl_Window_Driver.H @@ -58,26 +58,26 @@ public: static Fl_Gl_Window_Driver *newGlWindowDriver(Fl_Gl_Window *w); static Fl_Gl_Window_Driver *global(); virtual float pixels_per_unit() {return 1;} - virtual void before_show(int& need_after) {} + virtual void before_show(int&) {} virtual void after_show() {} virtual void invalidate(); - virtual int mode_(int m, const int *a) {return 0;} + virtual int mode_(int /*m*/, const int * /*a*/) {return 0;} virtual void make_current_before() {} virtual void make_current_after() {} virtual void swap_buffers() {} - virtual void resize(int is_a_resize, int w, int h) {} + virtual void resize(int /*is_a_resize*/, int /*w*/, int /*h*/) {} virtual char swap_type(); - virtual int flush_begin(char& valid_f) {return 0;} - virtual void gl_hide_before(void *& overlay) {} // the default implementation may be enough + virtual int flush_begin(char&) {return 0;} + virtual void gl_hide_before(void *&) {} // the default implementation may be enough static Fl_Gl_Choice *find_begin(int m, const int *alistp); static void add_context(GLContext ctx); static void del_context(GLContext ctx); // Return one of these structures for a given gl mode. // The second argument is a glX attribute list, and is used if mode is zero. // This is not supported on Win32: - virtual Fl_Gl_Choice *find(int mode, const int *alistp) {return NULL;} - virtual GLContext create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g, int layer = 0) {return 0;} - virtual void set_gl_context(Fl_Window* w, GLContext context) {} + virtual Fl_Gl_Choice *find(int /*mode*/, const int * /*alistp*/) {return NULL;} + virtual GLContext create_gl_context(Fl_Window*, const Fl_Gl_Choice*, int layer = 0) {(void)layer; return 0;} + virtual void set_gl_context(Fl_Window*, GLContext) {} virtual void delete_gl_context(GLContext) {} virtual void make_overlay(void* &o); virtual void hide_overlay() {} // the default implementation may be enough @@ -91,9 +91,9 @@ public: virtual void draw_string_legacy(const char* str, int n); // support for gl_draw() void draw_string_legacy_get_list(const char* str, int n); // support for gl_draw() static void draw_string_legacy_glut(const char* str, int n); // support for gl_draw() - virtual void get_list(Fl_Font_Descriptor* fd, int r) {} // support for gl_draw() without textures - virtual void gl_bitmap_font(Fl_Font_Descriptor *fl_fontsize) {} // support for gl_font() without textures - virtual int overlay_color(Fl_Color i) {return 0;} // support for gl_color() with HAVE_GL_OVERLAY + virtual void get_list(Fl_Font_Descriptor*, int) {} // support for gl_draw() without textures + virtual void gl_bitmap_font(Fl_Font_Descriptor *) {} // support for gl_font() without textures + virtual int overlay_color(Fl_Color) {return 0;} // support for gl_color() with HAVE_GL_OVERLAY static void draw_string_with_texture(const char* str, int n); // cross-platform // support for gl_draw(). The cross-platform version may be enough. virtual char *alpha_mask_for_string(const char *str, int n, int w, int h, Fl_Fontsize fs); diff --git a/src/Fl_Screen_Driver.H b/src/Fl_Screen_Driver.H index 8bff6fa62..1e0b79d14 100644 --- a/src/Fl_Screen_Driver.H +++ b/src/Fl_Screen_Driver.H @@ -69,8 +69,8 @@ public: static char bg2_set; static char fg_set; - virtual float scale(int n) { return 1; } - virtual void scale(int n, float f) {} + virtual float scale(int) { return 1; } + virtual void scale(int /*n*/, float /*f*/) {} static Fl_Screen_Driver *newScreenDriver(); // --- display management virtual void display(const char *disp); @@ -83,7 +83,7 @@ public: virtual int h() { return 600; } // default, override in driver! virtual int screen_count(); void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my); - virtual void screen_xywh(int &X, int &Y, int &W, int &H, int n) { + virtual void screen_xywh(int &X, int &Y, int &W, int &H, int /*n*/) { X = 0; Y = 0; W = 800; @@ -95,18 +95,19 @@ public: virtual void screen_dpi(float &h, float &v, int n = 0) { // override in driver! h = 72; v = 72; + (void)n; } void screen_work_area(int &X, int &Y, int &W, int &H, int mx, int my); virtual void screen_work_area(int &X, int &Y, int &W, int &H, int n) { screen_xywh(X, Y, W, H, n); } // --- audible output - virtual void beep(int type) {} + virtual void beep(int) {} // --- global events virtual void flush() {} // must override - virtual double wait(double time_to_wait) { return 0.0; } // must override + virtual double wait(double) { return 0.0; } // must override virtual int ready() { return 0; } // must override - virtual void grab(Fl_Window *win) {} + virtual void grab(Fl_Window *) {} // --- global colors /* the default implementation of parse_color() may be enough */ virtual int parse_color(const char *p, uchar &r, uchar &g, uchar &b); @@ -114,10 +115,10 @@ public: /* the default implementation of get_system_scheme() may be enough */ virtual const char *get_system_scheme(); // --- global timers - virtual void add_timeout(double time, Fl_Timeout_Handler cb, void *argp) {} - virtual void repeat_timeout(double time, Fl_Timeout_Handler cb, void *argp) {} - virtual int has_timeout(Fl_Timeout_Handler cb, void *argp) { return 0; } - virtual void remove_timeout(Fl_Timeout_Handler cb, void *argp) {} + virtual void add_timeout(double, Fl_Timeout_Handler, void *) {} + virtual void repeat_timeout(double, Fl_Timeout_Handler, void *) {} + virtual int has_timeout(Fl_Timeout_Handler, void *) { return 0; } + virtual void remove_timeout(Fl_Timeout_Handler, void *) {} static int secret_input_character; /* Implement to indicate whether complex text input may involve marked text. @@ -126,7 +127,7 @@ public: */ virtual int has_marked_text() const { return 0; } virtual void reset_marked_text() {} - virtual void insertion_point_location(int x, int y, int height) {} + virtual void insertion_point_location(int /*x*/, int /*y*/, int /*height*/) {} // implement so text-editing widgets support dead keys virtual int compose(int &del) { del = 0; @@ -136,7 +137,7 @@ public: virtual void compose_reset(); // implement to support drag-n-drop. use_selection = 1 means the GUI is welcome to display // the selected text during the D&D operation - virtual int dnd(int use_selection = 0) { return 0; } + virtual int dnd(int use_selection = 0) { (void)use_selection; return 0; } // null means no platform-specific key bindings for Fl_Text_Editor Fl_Text_Editor::Key_Binding *text_editor_extra_key_bindings; // default implementation may be enough @@ -166,9 +167,11 @@ public: win is the window to capture from, or NULL to capture from the current offscreen */ - virtual Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h, Fl_Window *win, + virtual Fl_RGB_Image *read_win_rectangle(int /*X*/, int /*Y*/, int /*w*/, int /*h*/, Fl_Window *, bool may_capture_subwins = false, bool *did_capture_subwins = NULL) { + (void)may_capture_subwins; + (void)did_capture_subwins; return NULL; } static void write_image_inside(Fl_RGB_Image *to, Fl_RGB_Image *from, int to_x, int to_y); @@ -178,7 +181,7 @@ public: // the default implementation may be enough virtual int input_widget_handle_key(int key, unsigned mods, unsigned shift, Fl_Input *input); // implement to support Fl::get_mouse() - virtual int get_mouse(int &x, int &y) { return 0; } + virtual int get_mouse(int &/*x*/, int &/*y*/) { return 0; } // optional methods to enable/disable input methods for complex scripts virtual void enable_im() {} virtual void disable_im() {} @@ -189,7 +192,7 @@ public: // optional method to close display access virtual void close_display() {} // compute dimensions of an Fl_Offscreen - virtual void offscreen_size(Fl_Offscreen off, int &width, int &height) {} + virtual void offscreen_size(Fl_Offscreen, int &/*width*/, int &/*height*/) {} void rescale_all_windows_from_screen(int screen, float f); static void transient_scale_display(float f, int nscreen); diff --git a/src/Fl_Sys_Menu_Bar_Driver.H b/src/Fl_Sys_Menu_Bar_Driver.H index be0fbbc9d..b8e4b4373 100644 --- a/src/Fl_Sys_Menu_Bar_Driver.H +++ b/src/Fl_Sys_Menu_Bar_Driver.H @@ -31,7 +31,7 @@ public: virtual ~Fl_Sys_Menu_Bar_Driver(); virtual void update() {} virtual void draw() { bar->Fl_Menu_Bar::draw();} - virtual void about(Fl_Callback *cb, void *data) {} + virtual void about(Fl_Callback *, void *) {} virtual int add(const char* label, int shortcut, Fl_Callback *cb, void *user_data, int flags) { return bar->Fl_Menu_Bar::add(label, shortcut, cb, user_data, flags); } diff --git a/src/Fl_System_Driver.H b/src/Fl_System_Driver.H index 165115e1e..0ba196d6a 100644 --- a/src/Fl_System_Driver.H +++ b/src/Fl_System_Driver.H @@ -76,11 +76,11 @@ public: static const int fl_YNegative; // implement if the system adds unwanted program argument(s) - virtual int single_arg(const char *arg) { return 0; } + virtual int single_arg(const char *) { return 0; } // implement if the system adds unwanted program argument pair(s) - virtual int arg_and_value(const char *name, const char *value) { return 0; } + virtual int arg_and_value(const char */*name*/, const char */*value*/) { return 0; } // implement to process the -display argument - virtual void display_arg(const char *arg) { } + virtual void display_arg(const char *) { } // default implementation should be enough virtual int XParseGeometry(const char* string, int* x, int* y, unsigned int* width, unsigned int* height); static void warning(const char* format, ...); @@ -95,30 +95,30 @@ public: // implement these to support cross-platform file operations virtual char *utf2mbcs(const char *s) {return (char*)s;} - virtual char *getenv(const char* v) {return NULL;} - virtual int putenv(const char *var) {return -1;} - virtual int open(const char* f, int oflags, int pmode) {return -1;} + virtual char *getenv(const char*) {return NULL;} + virtual int putenv(const char *) {return -1;} + virtual int open(const char* /*f*/, int /*oflags*/, int /*pmode*/) {return -1;} // implement these to support cross-platform string operations - virtual char *strdup(const char *s) {return NULL;} + virtual char *strdup(const char *) {return NULL;} // Note: the default implementation ignores the 'binary' argument. // Some platforms (notably Windows) may use this argument. - virtual int open_ext(const char* f, int binary, int oflags, int pmode) { + virtual int open_ext(const char* f, int /*binary*/, int oflags, int pmode) { return this->open(f, oflags, pmode); } virtual FILE *fopen(const char* f, const char *mode); - virtual int system(const char* cmd) {return -1;} - virtual int execvp(const char *file, char *const *argv) {return -1;} - virtual int chmod(const char* f, int mode) {return -1;} - virtual int access(const char* f, int mode) { return -1;} - virtual int stat(const char* f, struct stat *b) { return -1;} - virtual char *getcwd(char* b, int l) {return NULL;} - virtual int chdir(const char* path) {return -1;} - virtual int unlink(const char* fname) {return -1;} - virtual int mkdir(const char* f, int mode) {return -1;} - virtual int rmdir(const char* f) {return -1;} - virtual int rename(const char* f, const char *n) {return -1;} + virtual int system(const char*) {return -1;} + virtual int execvp(const char */*file*/, char *const */*argv*/) {return -1;} + virtual int chmod(const char* /*f*/, int /*mode*/) {return -1;} + virtual int access(const char* /*f*/, int /*mode*/) { return -1;} + virtual int stat(const char* /*f*/, struct stat *) { return -1;} + virtual char *getcwd(char* /*b*/, int /*l*/) {return NULL;} + virtual int chdir(const char*) {return -1;} + virtual int unlink(const char*) {return -1;} + virtual int mkdir(const char* /*f*/, int /*mode*/) {return -1;} + virtual int rmdir(const char*) {return -1;} + virtual int rename(const char* /*f*/, const char */*n*/) {return -1;} // the default implementation of these utf8... functions should be enough virtual unsigned utf8towc(const char* src, unsigned srclen, wchar_t* dst, unsigned dstlen); @@ -129,16 +129,19 @@ public: // implement to shield fprintf() from locale changes in decimal point virtual int clocale_printf(FILE *output, const char *format, va_list args); // implement functions telling whether a key is pressed - virtual int event_key(int k) {return 0;} - virtual int get_key(int k) {return 0;} + virtual int event_key(int) {return 0;} + virtual int get_key(int) {return 0;} // implement scandir-like function - virtual int filename_list(const char *d, dirent ***list, - int (*sort)(struct dirent **, struct dirent **), - char *errmsg=NULL, int errmsg_sz=0) {return -1;} + virtual int filename_list(const char * /*d*/, dirent ***, + int (*/*sort*/)(struct dirent **, struct dirent **), + char *errmsg=NULL, int errmsg_sz=0) { + (void)errmsg; (void)errmsg_sz; + return -1; + } // the default implementation of filename_expand() may be enough virtual int filename_expand(char *to, int tolen, const char *from); // to implement - virtual const char *getpwnam(const char *login) {return NULL;} + virtual const char *getpwnam(const char *) {return NULL;} // the default implementation of filename_relative() is in src/filename_absolute.cxx and may be enough virtual int filename_relative(char *to, int tolen, const char *from, const char *base); // the default implementation of filename_absolute() is in src/filename_absolute.cxx and may be enough @@ -156,7 +159,7 @@ public: // whether a platform uses additional code in Fl_Menu::handle_part1(int e) virtual int need_menu_handle_part1_extra() {return 0;} // implement to support fl_open_uri() - virtual int open_uri(const char *uri, char *msg, int msglen) {return 0;} + virtual int open_uri(const char */*uri*/, char */*msg*/, int /*msglen*/) {return 0;} // the default implementation of use_tooltip_timeout_condition() may be enough virtual int use_tooltip_timeout_condition() {return 0;} // the default implementation of use_recent_tooltip_fix() may be enough @@ -166,7 +169,7 @@ public: // the default implementation of need_test_shortcut_extra() may be enough virtual int need_test_shortcut_extra() {return 0;} // implement to support Fl_File_Browser::load() - virtual int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon) {return 0;} + virtual int file_browser_load_filesystem(Fl_File_Browser *, char */*filename*/, int /*lname*/, Fl_File_Icon *) {return 0;} // the default implementation of file_browser_load_directory() should be enough virtual int file_browser_load_directory(const char *directory, char *filename, size_t name_size, dirent ***pfiles, Fl_File_Sort_F *sort, @@ -174,14 +177,15 @@ public: // implement to support Fl_Preferences virtual void newUUID(char *uuidBuffer) { uuidBuffer[0] = 0; } // implement to support Fl_Preferences - virtual char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor, - const char *application) {return NULL;} + virtual char *preference_rootnode(Fl_Preferences *, Fl_Preferences::Root, + const char */*vendor*/, + const char */*application*/) {return NULL;} // the default implementation of preferences_need_protection_check() may be enough virtual int preferences_need_protection_check() {return 0;} // implement to support Fl_Plugin_Manager::load() - virtual void *load(const char *filename) {return NULL;} + virtual void *load(const char *) {return NULL;} // the default implementation is most probably enough - virtual void png_extra_rgba_processing(unsigned char *array, int w, int h) {} + virtual void png_extra_rgba_processing(unsigned char */*array*/, int /*w*/, int /*h*/) {} // the default implementation is most probably enough virtual const char *next_dir_sep(const char *start) { return strchr(start, '/');} // implement to support threading @@ -220,11 +224,11 @@ public: // the default implementation of tree_connector_style() is in Fl_Tree_Prefs.cxx and can be enough virtual int tree_connector_style(); // implement to support copy-to-clipboard - virtual void copy(const char *stuff, int len, int clipboard, const char *type) {} + virtual void copy(const char */*stuff*/, int /*len*/, int /*clipboard*/, const char */*type*/) {} // implement to support paste-from-clipboard - virtual void paste(Fl_Widget &receiver, int clipboard, const char *type) {} + virtual void paste(Fl_Widget &, int /*clipboard*/, const char */*type*/) {} // implement to support paste-from-clipboard - virtual int clipboard_contains(const char *type) {return 0;} + virtual int clipboard_contains(const char */*type*/) {return 0;} // implement to support paste-from-clipboard virtual void clipboard_notify_change() {} virtual void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0); diff --git a/src/Fl_Window_Driver.H b/src/Fl_Window_Driver.H index 048a4281a..dd99d23df 100644 --- a/src/Fl_Window_Driver.H +++ b/src/Fl_Window_Driver.H @@ -146,13 +146,13 @@ public: virtual void wait_for_expose(); virtual void destroy_double_buffer(); virtual void show(); - virtual void resize(int X,int Y,int W,int H) {} + virtual void resize(int /*X*/, int /*Y*/, int /*W*/, int /*H*/) {} virtual void hide() {} int hide_common(); virtual void map() {} virtual void unmap() {} virtual void fullscreen_on() {} - virtual void fullscreen_off(int X, int Y, int W, int H) {} + virtual void fullscreen_off(int /*X*/, int /*Y*/, int /*W*/, int /*H*/) {} virtual void use_border(); virtual void size_range(); virtual void iconize() {} @@ -160,7 +160,7 @@ public: *top = *left = *right = *bottom = 0; } virtual void show_with_args_begin() {} - virtual void show_with_args_end(int argc, char **argv) {} + virtual void show_with_args_end(int /*argc*/, char ** /*argv*/) {} virtual int can_do_overlay(); virtual void redraw_overlay(); @@ -170,20 +170,21 @@ public: // --- window shape stuff void shape_pixmap_(Fl_Image* pixmap); // platform-independent, support function - virtual void shape(const Fl_Image* img) {} - virtual void shape_alpha_(Fl_Image* img, int offset) {} + virtual void shape(const Fl_Image*) {} + virtual void shape_alpha_(Fl_Image*, int /*offset*/) {} // --- window icon stuff - virtual void icons(const Fl_RGB_Image *icons[], int count) {} + virtual void icons(const Fl_RGB_Image* /*icons*/[], int /*count*/) {} virtual const void *icon() const {return NULL;} - virtual void icon(const void * ic) {} + virtual void icon(const void *) {} virtual void free_icons() {} // --- window printing/drawing helper virtual void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right); - virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, - void (*draw_area)(void*, int,int,int,int), void* data) { return 0; } + virtual int scroll(int /*src_x*/, int /*src_y*/, int /*src_w*/, int /*src_h*/, + int /*dest_x*/, int /*dest_y*/, + void (*)(void*, int,int,int,int), void*) { return 0; } static inline Fl_Window_Driver* driver(const Fl_Window *win) {return win->pWindowDriver;} }; diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H index 7237028fd..d2b24cb30 100644 --- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H +++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H @@ -127,7 +127,7 @@ public: void draw_bitmap(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy); void draw_rgb(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy); // --- - Fl_Bitmask create_bitmask(int w, int h, const uchar *array) { return 0L; } + Fl_Bitmask create_bitmask(int /*w*/, int /*h*/, const uchar */*array*/) { return 0L; } void ps_origin(int x, int y); void ps_translate(int, int); diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H index 9c20b3b9b..a2ab981b4 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H @@ -100,8 +100,8 @@ public: virtual void offscreen_size(Fl_Offscreen o, int &width, int &height); virtual APP_SCALING_CAPABILITY rescalable() { return SYSTEMWIDE_APP_SCALING; } - virtual float scale(int n) {return scale_;} - virtual void scale(int n, float f) { scale_ = f;} + virtual float scale(int /*nscreen*/) {return scale_;} + virtual void scale(int /*nscreen*/, float f) { scale_ = f;} virtual Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h, Fl_Window *win, bool may_capture_subwins, bool *did_capture_subwins); virtual void default_icons(const Fl_RGB_Image *icons[], int count); private: diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H index 9932f0789..b3c7e9de7 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H @@ -83,8 +83,8 @@ public: int height(); int descent(); // --- - Fl_Bitmask create_bitmask(int w, int h, const uchar *array) { return 0L; } - void delete_bitmask(Fl_Bitmask bm) { } + Fl_Bitmask create_bitmask(int /*w*/, int /*h*/, const uchar */*array*/) { return 0L; } + void delete_bitmask(Fl_Bitmask) { } }; #endif // FL_OPENGL_GRAPHICS_DRIVER_H diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.H b/src/drivers/Posix/Fl_Posix_System_Driver.H index 80faabaff..8206871e6 100644 --- a/src/drivers/Posix/Fl_Posix_System_Driver.H +++ b/src/drivers/Posix/Fl_Posix_System_Driver.H @@ -88,7 +88,7 @@ public: virtual void lock_ring(); virtual void unlock_ring(); #endif - virtual void make_transient(void *ptr_gtk, void *gtk_window, Fl_Window *win) {} + virtual void make_transient(void */*ptr_gtk*/, void */*gtk_window*/, Fl_Window *) {} virtual void emulate_modal_dialog() {} }; diff --git a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H b/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H index 9f7b1068c..eb2060cc9 100644 --- a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H +++ b/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H @@ -239,7 +239,7 @@ public: void draw_rgb(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy); ~Fl_PostScript_Graphics_Driver(); // --- - Fl_Bitmask create_bitmask(int w, int h, const uchar *array) { return 0L; } + Fl_Bitmask create_bitmask(int /*w*/, int /*h*/, const uchar */*array*/) { return 0L; } virtual int has_feature(driver_feature feature_mask) { return feature_mask & PRINTER; } void ps_origin(int x, int y); diff --git a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx index c70a6dda0..1b411c704 100644 --- a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx @@ -116,6 +116,7 @@ void Fl_X11_Gl_Window_Driver::get_list(Fl_Font_Descriptor *fd, int r) { * have sufficient GL capability to support our font texture pile mechansim, * allowing XFT to render the face directly. */ // Face already set by gl_bitmap_font in this case. + (void)fd; (void)r; # else Fl_Xlib_Font_Descriptor *gl_fd = (Fl_Xlib_Font_Descriptor*)fd; if (gl_fd->glok[r]) return; @@ -273,13 +274,14 @@ Fl_Gl_Choice *Fl_X11_Gl_Window_Driver::find(int m, const int *alistp) } static bool ctxErrorOccurred = false; -static int ctxErrorHandler( Display *dpy, XErrorEvent *ev ) +static int ctxErrorHandler( Display *, XErrorEvent * ) { ctxErrorOccurred = true; return 0; } GLContext Fl_X11_Gl_Window_Driver::create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g, int layer) { + (void)window; (void)layer; GLContext shared_ctx = 0; if (context_list && nContext) shared_ctx = context_list[0]; diff --git a/src/xutf8/lcUniConv/big5.h b/src/xutf8/lcUniConv/big5.h index 3b39c80cd..fe10354d8 100644 --- a/src/xutf8/lcUniConv/big5.h +++ b/src/xutf8/lcUniConv/big5.h @@ -4103,6 +4103,7 @@ static const Summary16 big5_uni2indx_pagefe[23] = { static int big5_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; if (n >= 2) { const Summary16 *summary = NULL; if (wc < 0x0100) diff --git a/src/xutf8/lcUniConv/cp1251.h b/src/xutf8/lcUniConv/cp1251.h index 8c0b54c5c..4ae3e239a 100644 --- a/src/xutf8/lcUniConv/cp1251.h +++ b/src/xutf8/lcUniConv/cp1251.h @@ -91,6 +91,7 @@ static const unsigned char cp1251_page20[48] = { static int cp1251_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x0080) { *r = wc; diff --git a/src/xutf8/lcUniConv/cp936ext.h b/src/xutf8/lcUniConv/cp936ext.h index 4fff93bae..a01df9641 100644 --- a/src/xutf8/lcUniConv/cp936ext.h +++ b/src/xutf8/lcUniConv/cp936ext.h @@ -33,6 +33,7 @@ cp936ext_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) static int cp936ext_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)r; (void)wc; (void)n; return 0; } #endif /* NEED_TOMB */ diff --git a/src/xutf8/lcUniConv/gb2312.h b/src/xutf8/lcUniConv/gb2312.h index acd21be0f..e1de80c94 100644 --- a/src/xutf8/lcUniConv/gb2312.h +++ b/src/xutf8/lcUniConv/gb2312.h @@ -2518,6 +2518,7 @@ static const Summary16 gb2312_uni2indx_pageff[15] = { static int gb2312_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; if (n >= 2) { const Summary16 *summary = NULL; if (wc < 0x0460) diff --git a/src/xutf8/lcUniConv/iso8859_10.h b/src/xutf8/lcUniConv/iso8859_10.h index 94e1c6985..591fdfc85 100644 --- a/src/xutf8/lcUniConv/iso8859_10.h +++ b/src/xutf8/lcUniConv/iso8859_10.h @@ -74,6 +74,7 @@ static const unsigned char iso8859_10_page00[224] = { static int iso8859_10_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x00a0) { *r = wc; diff --git a/src/xutf8/lcUniConv/iso8859_11.h b/src/xutf8/lcUniConv/iso8859_11.h index 0d4d126fd..506c1f247 100644 --- a/src/xutf8/lcUniConv/iso8859_11.h +++ b/src/xutf8/lcUniConv/iso8859_11.h @@ -66,6 +66,7 @@ static const unsigned char iso8859_11_page0e[96] = { static int iso8859_11_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x0080 || wc == 0x00a0) { *r = wc; diff --git a/src/xutf8/lcUniConv/iso8859_13.h b/src/xutf8/lcUniConv/iso8859_13.h index 1f4ccd06c..0e9d883e8 100644 --- a/src/xutf8/lcUniConv/iso8859_13.h +++ b/src/xutf8/lcUniConv/iso8859_13.h @@ -77,6 +77,7 @@ static const unsigned char iso8859_13_page20[8] = { static int iso8859_13_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x00a0) { *r = wc; diff --git a/src/xutf8/lcUniConv/iso8859_14.h b/src/xutf8/lcUniConv/iso8859_14.h index b36b6b916..ac0d82db1 100644 --- a/src/xutf8/lcUniConv/iso8859_14.h +++ b/src/xutf8/lcUniConv/iso8859_14.h @@ -89,6 +89,7 @@ static const unsigned char iso8859_14_page1e_1[8] = { static int iso8859_14_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x00a0) { *r = wc; diff --git a/src/xutf8/lcUniConv/iso8859_15.h b/src/xutf8/lcUniConv/iso8859_15.h index 99d5ceb1a..7744ea8be 100644 --- a/src/xutf8/lcUniConv/iso8859_15.h +++ b/src/xutf8/lcUniConv/iso8859_15.h @@ -45,6 +45,7 @@ static const unsigned char iso8859_15_page01[48] = { static int iso8859_15_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x00a0) { *r = wc; diff --git a/src/xutf8/lcUniConv/iso8859_3.h b/src/xutf8/lcUniConv/iso8859_3.h index b2f3c7154..84ca0b38d 100644 --- a/src/xutf8/lcUniConv/iso8859_3.h +++ b/src/xutf8/lcUniConv/iso8859_3.h @@ -84,6 +84,7 @@ static const unsigned char iso8859_3_page02[8] = { static int iso8859_3_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x00a0) { *r = wc; diff --git a/src/xutf8/lcUniConv/iso8859_4.h b/src/xutf8/lcUniConv/iso8859_4.h index c5e261f7d..76551d9c4 100644 --- a/src/xutf8/lcUniConv/iso8859_4.h +++ b/src/xutf8/lcUniConv/iso8859_4.h @@ -80,6 +80,7 @@ static const unsigned char iso8859_4_page02[32] = { static int iso8859_4_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x00a0) { *r = wc; diff --git a/src/xutf8/lcUniConv/iso8859_5.h b/src/xutf8/lcUniConv/iso8859_5.h index 6d1970100..0381e70c5 100644 --- a/src/xutf8/lcUniConv/iso8859_5.h +++ b/src/xutf8/lcUniConv/iso8859_5.h @@ -61,6 +61,7 @@ static const unsigned char iso8859_5_page04[96] = { static int iso8859_5_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x00a0) { *r = wc; diff --git a/src/xutf8/lcUniConv/iso8859_6.h b/src/xutf8/lcUniConv/iso8859_6.h index bcff11928..d239be070 100644 --- a/src/xutf8/lcUniConv/iso8859_6.h +++ b/src/xutf8/lcUniConv/iso8859_6.h @@ -66,6 +66,7 @@ static const unsigned char iso8859_6_page06[80] = { static int iso8859_6_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x00a0) { *r = wc; diff --git a/src/xutf8/lcUniConv/iso8859_7.h b/src/xutf8/lcUniConv/iso8859_7.h index c85a68776..ee6452f65 100644 --- a/src/xutf8/lcUniConv/iso8859_7.h +++ b/src/xutf8/lcUniConv/iso8859_7.h @@ -72,6 +72,7 @@ static const unsigned char iso8859_7_page20[16] = { static int iso8859_7_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x00a0) { *r = wc; diff --git a/src/xutf8/lcUniConv/iso8859_8.h b/src/xutf8/lcUniConv/iso8859_8.h index a31e2aca5..0631e5dcf 100644 --- a/src/xutf8/lcUniConv/iso8859_8.h +++ b/src/xutf8/lcUniConv/iso8859_8.h @@ -73,6 +73,7 @@ static const unsigned char iso8859_8_page20[16] = { static int iso8859_8_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x00a0) { *r = wc; diff --git a/src/xutf8/lcUniConv/iso8859_9.h b/src/xutf8/lcUniConv/iso8859_9.h index 0986c2292..e244307e3 100644 --- a/src/xutf8/lcUniConv/iso8859_9.h +++ b/src/xutf8/lcUniConv/iso8859_9.h @@ -53,6 +53,7 @@ static const unsigned char iso8859_9_page01[72] = { static int iso8859_9_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x00d0) { *r = wc; diff --git a/src/xutf8/lcUniConv/jisx0201.h b/src/xutf8/lcUniConv/jisx0201.h index 1c7a8513d..f6fc26a24 100644 --- a/src/xutf8/lcUniConv/jisx0201.h +++ b/src/xutf8/lcUniConv/jisx0201.h @@ -32,6 +32,7 @@ jisx0201_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) static int jisx0201_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; if (wc < 0x0080 && !(wc == 0x005c || wc == 0x007e)) { *r = wc; return 1; diff --git a/src/xutf8/lcUniConv/jisx0208.h b/src/xutf8/lcUniConv/jisx0208.h index 37db9150d..e7910a5f4 100644 --- a/src/xutf8/lcUniConv/jisx0208.h +++ b/src/xutf8/lcUniConv/jisx0208.h @@ -2361,6 +2361,7 @@ static const Summary16 jisx0208_uni2indx_pageff[15] = { static int jisx0208_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; if (n >= 2) { const Summary16 *summary = NULL; if (wc < 0x0100) diff --git a/src/xutf8/lcUniConv/jisx0212.h b/src/xutf8/lcUniConv/jisx0212.h index d0cb69fb0..ba6e38b6f 100644 --- a/src/xutf8/lcUniConv/jisx0212.h +++ b/src/xutf8/lcUniConv/jisx0212.h @@ -2136,6 +2136,7 @@ static const Summary16 jisx0212_uni2indx_page4e[1307] = { static int jisx0212_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; if (n >= 2) { const Summary16 *summary = NULL; if (wc < 0x0460) diff --git a/src/xutf8/lcUniConv/koi8_r.h b/src/xutf8/lcUniConv/koi8_r.h index d85f41a28..95f5621ee 100644 --- a/src/xutf8/lcUniConv/koi8_r.h +++ b/src/xutf8/lcUniConv/koi8_r.h @@ -115,6 +115,7 @@ static const unsigned char koi8_r_page25[168] = { static int koi8_r_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x0080) { *r = wc; diff --git a/src/xutf8/lcUniConv/koi8_u.h b/src/xutf8/lcUniConv/koi8_u.h index abb6c8979..5e85062f6 100644 --- a/src/xutf8/lcUniConv/koi8_u.h +++ b/src/xutf8/lcUniConv/koi8_u.h @@ -122,6 +122,7 @@ static const unsigned char koi8_u_page25[168] = { static int koi8_u_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; (void)n; unsigned char c = 0; if (wc < 0x0080) { *r = wc; diff --git a/src/xutf8/lcUniConv/ksc5601.h b/src/xutf8/lcUniConv/ksc5601.h index 277c8d44b..72c9608ed 100644 --- a/src/xutf8/lcUniConv/ksc5601.h +++ b/src/xutf8/lcUniConv/ksc5601.h @@ -2966,6 +2966,7 @@ static const Summary16 ksc5601_uni2indx_pageff[15] = { static int ksc5601_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { + (void)conv; if (n >= 2) { const Summary16 *summary = NULL; if (wc < 0x0460) |