X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fguicast%2Fbcwindowbase.C;h=841d6c54c0105a0763e7b4ed8c4e6f6fd0a494ce;hb=425f9eab2f37d52e16e7ebdcd4b78f6de7ed68e7;hp=13eb4cd1d91fd8c8b4cf0d8829db66ee4d766d7d;hpb=2d99bb8ce591f05a31464b517d85dc2bc35b2abe;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/guicast/bcwindowbase.C b/cinelerra-5.0/guicast/bcwindowbase.C
index 13eb4cd1..841d6c54 100644
--- a/cinelerra-5.0/guicast/bcwindowbase.C
+++ b/cinelerra-5.0/guicast/bcwindowbase.C
@@ -33,7 +33,6 @@
 #include "bcsubwindow.h"
 #include "bcsynchronous.h"
 #include "bctimer.h"
-#include "bcwidgetgrid.h"
 #include "bcwindowbase.h"
 #include "bcwindowevents.h"
 #include "bccmodels.h"
@@ -134,15 +133,6 @@ BC_WindowBase::~BC_WindowBase()
 		delete subwindows;
 	}
 
-	if(widgetgrids) {
-		while (widgetgrids->total) {
-			delete widgetgrids->last();
-			widgetgrids->remove();
-		}
-		delete widgetgrids;
-	}
-
-
 	delete pixmap;
 
 #ifdef HAVE_GL
@@ -183,7 +173,9 @@ BC_WindowBase::~BC_WindowBase()
 		XFreeFont(display, largefont);
 		XFreeFont(display, bigfont);
 
-#ifdef HAVE_XFT
+// bug in X causes XRenderExtensionInfo to be damaged if this is done here
+//  left to be done in XCloseDisplay by Xlib.
+#if defined(HAVE_XFT) && 0
 		if(bigfont_xft)
 			XftFontClose (display, (XftFont*)bigfont_xft);
  		if(largefont_xft)
@@ -210,8 +202,8 @@ BC_WindowBase::~BC_WindowBase()
 #ifndef SINGLE_THREAD
 #ifdef HAVE_GL
 		if( (options & GLX_DISPLAY) != 0 && get_resources()->get_synchronous() ) {
-			printf("BC_WindowBase::~BC_WindowBase window deleted but opengl deletion is not\n"
-				"implemented for BC_Pixmap.\n");
+			printf(_("BC_WindowBase::~BC_WindowBase window deleted but opengl deletion is not\n"
+				"implemented for BC_Pixmap.\n"));
 			get_resources()->get_synchronous()->delete_display(this);
 		}
 		else
@@ -264,7 +256,6 @@ int BC_WindowBase::initialize()
 	top_level = 0;
 	parent_window = 0;
 	subwindows = 0;
-	widgetgrids = 0;
 	xinerama_info = 0;
 	xinerama_screens = 0;
 	xvideo_port_id = -1;
@@ -421,7 +412,6 @@ int BC_WindowBase::create_window(BC_WindowBase *parent_window,
 	if(bg_pixmap) shared_bg_pixmap = 1;
 
 	subwindows = new BC_SubWindowList;
-	widgetgrids = new BC_WidgetGridList;
 
 	if(window_type == MAIN_WINDOW)
 	{
@@ -667,7 +657,7 @@ Display* BC_WindowBase::init_display(const char *display_name)
   		printf("BC_WindowBase::init_display: cannot connect to X server %s\n",
 			display_name);
   		if(getenv("DISPLAY") == NULL) {
-			printf("'DISPLAY' environment variable not set.\n");
+			printf(_("'DISPLAY' environment variable not set.\n"));
   			exit(1);
 		}
 		else {
@@ -3154,13 +3144,6 @@ BC_WindowBase* BC_WindowBase::add_tool(BC_WindowBase *subwindow)
 	return add_subwindow(subwindow);
 }
 
-BC_WidgetGrid* BC_WindowBase::add_widgetgrid(BC_WidgetGrid *widgetgrid)
-{
-	widgetgrids->append(widgetgrid);
-	return widgetgrid;
-}
-
-
 int BC_WindowBase::flash(int x, int y, int w, int h, int flush)
 {
 //printf("BC_WindowBase::flash %d %d %d %d %d\n", __LINE__, w, h, this->w, this->h);
@@ -3894,11 +3877,6 @@ int BC_WindowBase::resize_event(int w, int h)
 	return 0;
 }
 
-int BC_WindowBase::reposition_widget(int x, int y, int w, int h)
-{
-	return reposition_window(x, y, w, h);
-}
-
 int BC_WindowBase::reposition_window(int x, int y)
 {
 	reposition_window(x, y, -1, -1);