diff options
| author | Lauri Kasanen <cand@gmx.com> | 2014-08-21 12:13:47 +0000 |
|---|---|---|
| committer | Lauri Kasanen <cand@gmx.com> | 2014-08-21 12:13:47 +0000 |
| commit | d9505e1b249b0833b867019b88f68b7aaf31e937 (patch) | |
| tree | 3dd963d0f5ebeaab937058718a3fe850ae6fb6d9 | |
| parent | 88b5e53289856e557244a337a7cba39367a83f71 (diff) | |
Mark a few symbols static. This is the bulk from STR #3111.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10232 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_x.cxx | 50 | ||||
| -rw-r--r-- | src/fl_ask.cxx | 2 | ||||
| -rw-r--r-- | src/fl_font_xft.cxx | 4 | ||||
| -rw-r--r-- | src/fl_gtk.cxx | 4 |
4 files changed, 30 insertions, 30 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 0ee3c6482..758ee5491 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -310,9 +310,9 @@ Window fl_message_window = 0; int fl_screen; XVisualInfo *fl_visual; Colormap fl_colormap; -XIM fl_xim_im = 0; +static XIM fl_xim_im = 0; XIC fl_xim_ic = 0; -char fl_is_over_the_spot = 0; +static char fl_is_over_the_spot = 0; static XRectangle status_area; static Atom WM_DELETE_WINDOW; @@ -335,24 +335,24 @@ Atom fl_XdndActionCopy; Atom fl_XdndFinished; //Atom fl_XdndProxy; Atom fl_XdndURIList; -Atom fl_Xatextplainutf; -Atom fl_Xatextplainutf2; // STR#2930 -Atom fl_Xatextplain; +static Atom fl_Xatextplainutf; +static Atom fl_Xatextplainutf2; // STR#2930 +static Atom fl_Xatextplain; static Atom fl_XaText; -Atom fl_XaCompoundText; +static Atom fl_XaCompoundText; Atom fl_XaUtf8String; -Atom fl_XaTextUriList; -Atom fl_XaImageBmp; -Atom fl_XaImagePNG; -Atom fl_INCR; -Atom fl_NET_WM_NAME; // utf8 aware window label -Atom fl_NET_WM_ICON_NAME; // utf8 aware window icon name -Atom fl_NET_SUPPORTING_WM_CHECK; -Atom fl_NET_WM_STATE; -Atom fl_NET_WM_STATE_FULLSCREEN; -Atom fl_NET_WM_FULLSCREEN_MONITORS; -Atom fl_NET_WORKAREA; -Atom fl_NET_WM_ICON; +static Atom fl_XaTextUriList; +static Atom fl_XaImageBmp; +static Atom fl_XaImagePNG; +static Atom fl_INCR; +static Atom fl_NET_WM_NAME; // utf8 aware window label +static Atom fl_NET_WM_ICON_NAME; // utf8 aware window icon name +static Atom fl_NET_SUPPORTING_WM_CHECK; +static Atom fl_NET_WM_STATE; +static Atom fl_NET_WM_STATE_FULLSCREEN; +static Atom fl_NET_WM_FULLSCREEN_MONITORS; +static Atom fl_NET_WORKAREA; +static Atom fl_NET_WM_ICON; /* X defines 32-bit-entities to have a format value of max. 32, @@ -384,7 +384,7 @@ extern "C" { extern char *fl_get_font_xfld(int fnum, int size); -void fl_new_ic() +static void fl_new_ic() { XVaNestedList preedit_attr = NULL; XVaNestedList status_attr = NULL; @@ -561,7 +561,7 @@ void fl_set_status(int x, int y, int w, int h) XFree(status_attr); } -void fl_init_xim() { +static void fl_init_xim() { static int xim_warning = 2; if (xim_warning > 0) xim_warning--; @@ -865,11 +865,11 @@ int Fl::clipboard_contains(const char *type) return retval; } -Window fl_dnd_source_window; -Atom *fl_dnd_source_types; // null-terminated list of data types being supplied -Atom fl_dnd_type; -Atom fl_dnd_source_action; -Atom fl_dnd_action; +static Window fl_dnd_source_window; +static Atom *fl_dnd_source_types; // null-terminated list of data types being supplied +static Atom fl_dnd_type; +static Atom fl_dnd_source_action; +static Atom fl_dnd_action; void fl_sendClientMessage(Window window, Atom message, unsigned long d0, diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx index 9bfe8285c..a74055ac3 100644 --- a/src/fl_ask.cxx +++ b/src/fl_ask.cxx @@ -126,7 +126,7 @@ static Fl_Window *makeform() { * that is asked of them... */ -void resizeform() { +static void resizeform() { int i; int message_w, message_h; int text_height; diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx index dc7aff679..67921699a 100644 --- a/src/fl_font_xft.cxx +++ b/src/fl_font_xft.cxx @@ -101,8 +101,8 @@ Fl_Fontdesc* fl_fonts = built_in_table; Fl_XFont_On_Demand fl_xfont; void *fl_xftfont = 0; -//const char* fl_encoding_ = "iso8859-1"; -const char* fl_encoding_ = "iso10646-1"; +//static const char* fl_encoding_ = "iso8859-1"; +static const char* fl_encoding_ = "iso10646-1"; static void fl_xft_font(Fl_Xlib_Graphics_Driver *driver, Fl_Font fnum, Fl_Fontsize size, int angle) { if (fnum==-1) { // special case to stop font caching diff --git a/src/fl_gtk.cxx b/src/fl_gtk.cxx index 955ecca95..edf3f920a 100644 --- a/src/fl_gtk.cxx +++ b/src/fl_gtk.cxx @@ -203,7 +203,7 @@ static void draw(int which, int x,int y,int w,int h, int inset) } } -void gtk_round_up_box(int x, int y, int w, int h, Fl_Color c) { +static void gtk_round_up_box(int x, int y, int w, int h, Fl_Color c) { fl_color(c); draw(FILL, x, y, w, h, 2); @@ -234,7 +234,7 @@ void gtk_round_up_box(int x, int y, int w, int h, Fl_Color c) { draw(CLOSED, x, y, w, h, 0); } -void gtk_round_down_box(int x, int y, int w, int h, Fl_Color c) { +static void gtk_round_down_box(int x, int y, int w, int h, Fl_Color c) { fl_color(c); draw(FILL, x, y, w, h, 2); |
