diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
| commit | 8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch) | |
| tree | 7ad930ebc554ab68af1911f4dfd217cc18b86cce /gui/mplayer/gtk/gtk_common.h | |
| parent | 52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff) | |
| parent | 8c5889004f7ba9f6fcbca20a05a9301771348408 (diff) | |
| download | mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.bz2 mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.xz | |
Merge svn changes up to r28087
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
Diffstat (limited to 'gui/mplayer/gtk/gtk_common.h')
| -rw-r--r-- | gui/mplayer/gtk/gtk_common.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/gui/mplayer/gtk/gtk_common.h b/gui/mplayer/gtk/gtk_common.h index 34137c9bbb..eff9887e1f 100644 --- a/gui/mplayer/gtk/gtk_common.h +++ b/gui/mplayer/gtk/gtk_common.h @@ -22,20 +22,20 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -extern GtkWidget * AddDialogFrame( GtkWidget * parent ); -extern GtkWidget * AddFrame( const char * title,int type,GtkWidget * parent,int add ); -extern GtkWidget * AddLabel( const char * title,GtkWidget * parent ); -extern GtkWidget * AddVBox( GtkWidget * parent,int type ); -extern GtkWidget * AddHBox( GtkWidget * parent,int type ); -extern GtkWidget * AddCheckButton( const char * title, GtkWidget * parent ); -extern GtkWidget * AddRadioButton( const char * title,GSList ** group,GtkWidget * parent ); -extern GtkWidget * AddSpinButton( const char * title,GtkAdjustment * adj,GtkWidget * parent ); -extern GtkWidget * AddButton( const char * title,GtkWidget * parent ); -extern GtkWidget * AddHSeparator( GtkWidget * parent ); -extern GtkWidget * AddHButtonBox( GtkWidget * parent ); -extern GtkWidget * AddHScaler( GtkAdjustment * adj,GtkWidget * parent,int digit ); -extern GtkWidget * AddVScaler( GtkAdjustment * adj,GtkWidget * parent,int digit ); -extern GtkWidget * AddComboBox( GtkWidget * parent ); -extern void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer ); +GtkWidget * AddDialogFrame( GtkWidget * parent ); +GtkWidget * AddFrame( const char * title, int type, GtkWidget * parent, int add ); +GtkWidget * AddLabel( const char * title, GtkWidget * parent ); +GtkWidget * AddVBox( GtkWidget * parent, int type ); +GtkWidget * AddHBox( GtkWidget * parent, int type ); +GtkWidget * AddCheckButton( const char * title, GtkWidget * parent ); +GtkWidget * AddRadioButton( const char * title, GSList ** group, GtkWidget * parent ); +GtkWidget * AddSpinButton( const char * title, GtkAdjustment * adj, GtkWidget * parent ); +GtkWidget * AddButton( const char * title, GtkWidget * parent ); +GtkWidget * AddHSeparator( GtkWidget * parent ); +GtkWidget * AddHButtonBox( GtkWidget * parent ); +GtkWidget * AddHScaler( GtkAdjustment * adj, GtkWidget * parent, int digit ); +GtkWidget * AddVScaler( GtkAdjustment * adj, GtkWidget * parent, int digit ); +GtkWidget * AddComboBox( GtkWidget * parent ); +void WidgetDestroy( GtkWidget * widget, GtkWidget ** widget_pointer ); #endif /* MPLAYER_GUI_GTK_COMMON_H */ |