diff Gui/mplayer/gtk/common.c @ 8299:5b67aed0fc28

- remove some unused/nonusable variables - remove unneded gtk function - replace some gtk function - small bug fixes

--- a/Gui/mplayer/gtk/common.c	Wed Nov 27 22:45:54 2002 +0000
+++ b/Gui/mplayer/gtk/common.c	Wed Nov 27 22:48:56 2002 +0000
@@ -2,12 +2,24 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+#include "common.h"
+
+GtkWidget * AddDialogFrame( GtkWidget * parent )
+{
+ GtkWidget * frame;
+ frame=AddFrame( NULL,GTK_SHADOW_IN,parent,1 );
+ gtk_container_set_border_width( GTK_CONTAINER( frame ),1 );
+ frame=AddFrame( NULL,GTK_SHADOW_NONE,frame,1 );
+ frame=AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,frame,1 );
+ frame=AddFrame( NULL,GTK_SHADOW_NONE,frame,1 );
+ return frame;
+}
+
 GtkWidget * AddFrame( char * title,int type,GtkWidget * parent,int add )
 {
  GtkWidget * frame = NULL;
  frame=gtk_frame_new( title );
  gtk_widget_set_name( frame,"frame" );
- gtk_widget_ref( frame );
  gtk_widget_show( frame );
  if ( add ) gtk_container_add( GTK_CONTAINER( parent ),frame );
   else gtk_box_pack_start( GTK_BOX( parent ),frame,FALSE,FALSE,0 );
@@ -27,14 +39,17 @@
  return label;
 }
 
-GtkWidget * AddVBox( GtkWidget * parent )
+GtkWidget * AddVBox( GtkWidget * parent,int type )
 {
  GtkWidget * vbox;
  vbox=gtk_vbox_new( FALSE,0 );
  gtk_widget_set_name( vbox,"vbox" );
- gtk_widget_ref( vbox );
  gtk_widget_show( vbox );
- gtk_container_add( GTK_CONTAINER( parent ),vbox );
+ if ( parent ) 
+  {
+   if ( type ) gtk_box_pack_start( GTK_BOX( parent ),vbox,FALSE,FALSE,0 );
+    else gtk_container_add( GTK_CONTAINER( parent ),vbox );
+  }
  return vbox;
 }
 
@@ -43,10 +58,12 @@
  GtkWidget * hbox;
  hbox=gtk_hbox_new( FALSE,0 );
  gtk_widget_set_name( hbox,"hbox" );
- gtk_widget_ref( hbox );
  gtk_widget_show( hbox );
- if ( type ) gtk_box_pack_start( GTK_BOX( parent ),hbox,FALSE,FALSE,0 );
-  else gtk_container_add( GTK_CONTAINER( parent ),hbox );
+ if ( parent )
+  {
+   if ( type ) gtk_box_pack_start( GTK_BOX( parent ),hbox,FALSE,FALSE,0 );
+    else gtk_container_add( GTK_CONTAINER( parent ),hbox );
+  }
  return hbox;
 }
 
@@ -55,7 +72,6 @@
  GtkWidget * CB;
  CB=gtk_check_button_new_with_label( title );
  gtk_widget_set_name( CB,"CB" );
- gtk_widget_ref( CB );
  gtk_widget_show( CB );
  gtk_box_pack_start( GTK_BOX( parent ),CB,FALSE,FALSE,0 );
  return CB;
@@ -67,7 +83,6 @@
  RB=gtk_radio_button_new_with_label( *group,title );
  *group=gtk_radio_button_group( GTK_RADIO_BUTTON( RB ) );
  gtk_widget_set_name( RB,"RB" );
- gtk_widget_ref( RB );
  gtk_widget_show( RB );
  gtk_box_pack_start( GTK_BOX( parent ),RB,FALSE,FALSE,0 );
  return RB;
@@ -78,7 +93,6 @@
  GtkWidget * B;
  B=gtk_button_new_with_label( title );
  gtk_widget_set_name( B,"B" );
- gtk_widget_ref( B );
  gtk_widget_show( B );
  gtk_container_add( GTK_CONTAINER( parent ),B );
  return B;
@@ -89,7 +103,6 @@
  GtkWidget * hseparator;
  hseparator=gtk_hseparator_new();
  gtk_widget_set_name( hseparator,"hseparator1" );
- gtk_widget_ref( hseparator );
  gtk_widget_show( hseparator );
  gtk_box_pack_start( GTK_BOX( parent ),hseparator,FALSE,FALSE,0 );
  gtk_widget_set_usize( hseparator,-2,6 );
@@ -101,7 +114,6 @@
  GtkWidget * hbuttonbox;
  hbuttonbox=gtk_hbutton_box_new();
  gtk_widget_set_name( hbuttonbox,"hbuttonbox" );
- gtk_widget_ref( hbuttonbox );
  gtk_widget_show( hbuttonbox );
  gtk_box_pack_start( GTK_BOX( parent ),hbuttonbox,FALSE,FALSE,0 );
  gtk_button_box_set_child_size( GTK_BUTTON_BOX( hbuttonbox ),85,20 );
@@ -113,10 +125,32 @@
  GtkWidget * HS;
  HS=gtk_hscale_new( adj );
  gtk_widget_set_name( HS,"HS" );
- gtk_widget_ref( HS );
  gtk_widget_show( HS );
  if ( parent ) gtk_box_pack_start( GTK_BOX( parent ),HS,TRUE,TRUE,0 );
  gtk_scale_set_value_pos( GTK_SCALE( HS ),GTK_POS_RIGHT );
  gtk_scale_set_digits( GTK_SCALE( HS ),digit );
  return HS;
 }
+
+GtkWidget * AddVScaler( GtkAdjustment * adj,GtkWidget * parent,int digit )
+{
+ GtkWidget * VS;
+ VS=gtk_vscale_new( adj );
+ gtk_widget_set_name( VS,"VS" );
+ gtk_widget_show( VS );
+ if ( parent ) gtk_box_pack_start( GTK_BOX( parent ),VS,TRUE,TRUE,0 );
+// gtk_scale_set_value_pos( GTK_SCALE( VS ),GTK_POS_RIGHT );
+ if ( digit == -1 ) gtk_scale_set_draw_value( GTK_SCALE( VS ),FALSE );
+  else gtk_scale_set_digits( GTK_SCALE( VS ),digit );
+ return VS;
+}
+
+GtkWidget * AddComboBox( GtkWidget * parent )
+{
+ GtkWidget * CB;
+ CB=gtk_combo_new();
+ gtk_widget_set_name( CB,"CB" );
+ gtk_widget_show( CB );
+ if ( parent ) gtk_box_pack_start( GTK_BOX( parent ),CB,TRUE,TRUE,0 );
+ return CB;
+}