changeset 32842:fe8f9b5d3ba2

Cosmetic: Limit scope of internal functions.
author ib
date Sat, 19 Feb 2011 12:50:54 +0000
parents f698af71f514
children 084b39f800c7
files gui/skin/font.c gui/skin/font.h
diffstat 2 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gui/skin/font.c	Sat Feb 19 09:17:38 2011 +0000
+++ b/gui/skin/font.c	Sat Feb 19 12:50:54 2011 +0000
@@ -29,7 +29,7 @@
 
 bmpFont * Fonts[MAX_FONTS] = {0};
 
-int fntAddNewFont( char * name )
+static int fntAddNewFont( char * name )
 {
  int id, i;
 
@@ -155,7 +155,7 @@
 
 // get Fnt index of character (utf8 or normal one) *str points to,
 // then move pointer to next/previous character
-int fntGetCharIndex( int id, unsigned char **str, gboolean utf8, int direction )
+static int fntGetCharIndex( int id, unsigned char **str, gboolean utf8, int direction )
 {
  unsigned char *p, uchar[6] = "";   // glib implements 31-bit UTF-8
  int i, c = -1;
@@ -211,7 +211,7 @@
  return size;
 }
 
-int fntTextHeight( int id,char * str )
+static int fntTextHeight( int id,char * str )
 {
  int max = 0;
  gboolean utf8;
--- a/gui/skin/font.h	Sat Feb 19 09:17:38 2011 +0000
+++ b/gui/skin/font.h	Sat Feb 19 12:50:54 2011 +0000
@@ -19,7 +19,6 @@
 #ifndef MPLAYER_GUI_FONT_H
 #define MPLAYER_GUI_FONT_H
 
-#include <gtk/gtk.h>
 #include "gui/bitmap.h"
 #include "gui/app.h"
 
@@ -50,11 +49,8 @@
 
 extern bmpFont  * Fonts[MAX_FONTS];
 
-int  fntAddNewFont( char * name );
 void fntFreeFont( void );
 int  fntFindID( char * name );
-int  fntGetCharIndex( int id, unsigned char **str, gboolean utf8, int direction );
-int  fntTextHeight( int id, char * str );
 int  fntTextWidth( int id, char * str );
 
 int        fntRead( char * path, char * fname );