Thread: [Mplayerplug-in-cvs] mplayerplug-in/Source plugin-setup.h,1.42,1.43 plugin-threads.cpp,1.168,1.169 p
Brought to you by:
kdekorte
From: Kevin D. <kde...@us...> - 2005-08-26 13:29:39
|
Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6352/Source Modified Files: plugin-setup.h plugin-threads.cpp plugin-ui.cpp plugin.cpp Log Message: Removed widget realize code, it did bad things Fix X mode compilation issues Index: plugin-ui.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-ui.cpp,v retrieving revision 1.145 retrieving revision 1.146 diff -C2 -d -r1.145 -r1.146 *** plugin-ui.cpp 25 Aug 2005 18:40:53 -0000 1.145 --- plugin-ui.cpp 26 Aug 2005 13:29:27 -0000 1.146 *************** *** 970,974 **** if (instance->mmsstream == 0 && win_width > 126) { instance->rew_event_box = gtk_event_box_new(); - gtk_widget_realize(instance->rew_event_box); gtk_widget_set_events(instance->rew_event_box, GDK_BUTTON_PRESS_MASK); --- 970,973 ---- *************** *** 996,1000 **** // play instance->play_event_box = gtk_event_box_new(); - gtk_widget_realize(instance->play_event_box); gtk_widget_set_events(instance->play_event_box, GDK_BUTTON_PRESS_MASK); --- 995,998 ---- *************** *** 1020,1024 **** // pause instance->pause_event_box = gtk_event_box_new(); - gtk_widget_realize(instance->pause_event_box); gtk_widget_set_events(instance->pause_event_box, GDK_BUTTON_PRESS_MASK); --- 1018,1021 ---- *************** *** 1047,1051 **** // stop instance->stop_event_box = gtk_event_box_new(); - gtk_widget_realize(instance->stop_event_box); gtk_widget_set_events(instance->stop_event_box, GDK_BUTTON_PRESS_MASK); --- 1044,1047 ---- *************** *** 1072,1076 **** if (instance->mmsstream == 0 && win_width > 126) { instance->ff_event_box = gtk_event_box_new(); - gtk_widget_realize(instance->ff_event_box); gtk_widget_set_events(instance->ff_event_box, GDK_BUTTON_PRESS_MASK); --- 1068,1071 ---- *************** *** 1116,1120 **** // fullscreen instance->fs_event_box = gtk_event_box_new(); - gtk_widget_realize(instance->fs_event_box); gtk_widget_set_events(instance->fs_event_box, GDK_BUTTON_PRESS_MASK); --- 1111,1114 ---- Index: plugin-threads.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-threads.cpp,v retrieving revision 1.168 retrieving revision 1.169 diff -C2 -d -r1.168 -r1.169 *** plugin-threads.cpp 22 Aug 2005 23:48:06 -0000 1.168 --- plugin-threads.cpp 26 Aug 2005 13:29:27 -0000 1.169 *************** *** 1235,1241 **** } } snprintf(local_td->instance->lastmessage, 1024, "Stopped"); g_idle_add(gtkgui_message, local_td->instance); ! return retval; } --- 1235,1242 ---- } } + #ifdef GTK_ENABLED snprintf(local_td->instance->lastmessage, 1024, "Stopped"); g_idle_add(gtkgui_message, local_td->instance); ! #endif return retval; } Index: plugin-setup.h =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin-setup.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** plugin-setup.h 16 Aug 2005 03:46:59 -0000 1.42 --- plugin-setup.h 26 Aug 2005 13:29:27 -0000 1.43 *************** *** 208,213 **** void menuitem_config_callback(GtkMenuItem * menuitem, nsPluginInstance * instance); gboolean window_visible(GtkWidget *widget,GdkEvent *event,nsPluginInstance * instance); - int srcToButton(char *url, nsPluginInstance * instance); #endif //plugin-threads.cpp --- 208,213 ---- void menuitem_config_callback(GtkMenuItem * menuitem, nsPluginInstance * instance); gboolean window_visible(GtkWidget *widget,GdkEvent *event,nsPluginInstance * instance); #endif + int srcToButton(char *url, nsPluginInstance * instance); //plugin-threads.cpp Index: plugin.cpp =================================================================== RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v retrieving revision 1.232 retrieving revision 1.233 diff -C2 -d -r1.232 -r1.233 *** plugin.cpp 25 Aug 2005 18:40:53 -0000 1.232 --- plugin.cpp 26 Aug 2005 13:29:27 -0000 1.233 *************** *** 807,811 **** fixed_event_box = gtk_event_box_new(); fixed_container = gtk_fixed_new(); - gtk_widget_realize(GTK_WIDGET(fixed_event_box)); gtk_widget_set_events(GTK_WIDGET(fixed_event_box), GDK_BUTTON_PRESS_MASK); --- 807,810 ---- *************** *** 2507,2511 **** #ifdef GTK1_ENABLED fs_window = gtk_window_new(GTK_WINDOW_POPUP); - gtk_widget_realize(fs_window); gtk_widget_set_events(fs_window, GDK_KEY_PRESS_MASK); gtk_widget_set_events(fs_window, GDK_BUTTON_PRESS_MASK); --- 2506,2509 ---- |