Attachment #98 for bug #538

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 538
Collapse All | Expand All




#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <glib/glist.h>

#ifdef HAVE_BONOBO
#include <libbonobo.h>
#include <libbonoboui.h>
#endif

#include <gdk-pixbuf/gdk-pixbuf.h>

#include "qt_style.h"

	gint width,
	gint height)
{
	GList *child_list;
	GtkWidget *child;
	
	GtkNotebook *nb;
	int nbpages;
	sanitize_size(window, &width, &height);

		{
			if (GTK_IS_WIDGET(parent))
			{
#ifdef HAVE_BONOBO
				if (GTK_IS_TOOLBAR(parent) || BONOBO_IS_UI_TOOLBAR(parent))
#else
				if (GTK_IS_TOOLBAR(parent))
#endif
				{
					toolbutton = 1;
					break;

			
			if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2))
			{
				child_list = g_list_first((GTK_BOX(parent)->children));
				child = (GtkWidget *)child_list->data;
				if (GTK_IS_ENTRY(child))
				{
					drawSquareButton(window,style,state_type,x,y,width,height);
					return;
				}
				
				child_list = g_list_last((GTK_BOX(parent)->children));
				child = ((GtkBoxChild *)child_list->data)->widget;
				if (GTK_IS_ENTRY(child))
				{
					drawSquareButton(window,style,state_type,x,y,width,height);

Lines 8-17 Link Here

(-)src/CMakeLists.txt (-3 / +3 lines)
8	ADD_LIBRARY(qtengine SHARED ${GTK-QT-SOURCES})	8	ADD_LIBRARY(qtengine SHARED ${GTK-QT-SOURCES})
9		9
10	# Add GTK's cflags	10	# Add GTK's cflags
11	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTK_CFLAGS} ${BONOBO_CFLAGS}")	11	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTK_CFLAGS}")
12	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTK_CFLAGS} ${BONOBO_CFLAGS}")	12	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTK_CFLAGS}")
13		13
14	TARGET_LINK_LIBRARIES(qtengine ${GTK_LINK_FLAGS} ${BONOBO_LINK_FLAGS} ${TQT_LIBRARIES} -lX11)	14	TARGET_LINK_LIBRARIES(qtengine ${GTK_LINK_FLAGS} ${TQT_LIBRARIES} -lX11)
15		15
16	INSTALL(	16	INSTALL(
17	TARGETS qtengine	17	TARGETS qtengine




MESSAGE(STATUS "Found GTK include dir: ${GTK_INCLUDE_DIR}")
MESSAGE(STATUS "Found GTK library dir: ${GTK_LIB_DIR}")

# Find Bonobo
PKGCONFIG(libbonoboui-2.0 BONOBO_INCLUDE_DIR BONOBO_LIB_DIR BONOBO_LINK_FLAGS BONOBO_CFLAGS)
IF (NOT BONOBO_INCLUDE_DIR)
	MESSAGE(STATUS "bonoboui not found.  Some features of the theme engine will not work as intended.")
ELSE (NOT BONOBO_INCLUDE_DIR)
	MESSAGE(STATUS "Found Bonobo include dir: ${BONOBO_INCLUDE_DIR}")
	MESSAGE(STATUS "Found Bonobo library dir: ${BONOBO_LIB_DIR}")
	SET(BONOBO_DEFINITIONS -D HAVE_BONOBO)
ENDIF (NOT BONOBO_INCLUDE_DIR)

# Find msgfmt
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
FIND_PACKAGE(Msgfmt REQUIRED)

Return to bug 538

Lines 4-15 Link Here

(-)src/qt_theme_draw.c (-15 / +6 lines)
4	#include <gdk/gdk.h>	4	#include <gdk/gdk.h>
5	#include <gtk/gtk.h>	5	#include <gtk/gtk.h>
6	#include <glib/glist.h>	6	#include <glib/glist.h>
7
8	#ifdef HAVE_BONOBO
9	#include <libbonobo.h>
10	#include <libbonoboui.h>
11	#endif
12
13	#include <gdk-pixbuf/gdk-pixbuf.h>	7	#include <gdk-pixbuf/gdk-pixbuf.h>
14		8
15	#include "qt_style.h"	9	#include "qt_style.h"
Lines 609-616 Link Here
609	gint width,	603	gint width,
610	gint height)	604	gint height)
611	{	605	{
612	GList *child1;	606	GList *child_list;
613	GtkWidget *child;	607	GtkWidget *child;
		608
614	GtkNotebook *nb;	609	GtkNotebook *nb;
615	int nbpages;	610	int nbpages;
616	sanitize_size(window, &width, &height);	611	sanitize_size(window, &width, &height);
Lines 716-726 Link Here
716	{	711	{
717	if (GTK_IS_WIDGET(parent))	712	if (GTK_IS_WIDGET(parent))
718	{	713	{
719	#ifdef HAVE_BONOBO
720	if (GTK_IS_TOOLBAR(parent) \|\| BONOBO_IS_UI_TOOLBAR(parent))
721	#else
722	if (GTK_IS_TOOLBAR(parent))	714	if (GTK_IS_TOOLBAR(parent))
723	#endif
724	{	715	{
725	toolbutton = 1;	716	toolbutton = 1;
726	break;	717	break;
Lines 746-761 Link Here
746		737
747	if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2))	738	if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2))
748	{	739	{
749	child1 = g_list_first((GTK_BOX(parent)->children));	740	child_list = g_list_first((GTK_BOX(parent)->children));
750	child = ((GtkBoxChild *)child1->data)->widget;	741	child = (GtkWidget *)child_list->data;
751	if (GTK_IS_ENTRY(child))	742	if (GTK_IS_ENTRY(child))
752	{	743	{
753	drawSquareButton(window,style,state_type,x,y,width,height);	744	drawSquareButton(window,style,state_type,x,y,width,height);
754	return;	745	return;
755	}	746	}
756		747
757	child1 = g_list_last((GTK_BOX(parent)->children));	748	child_list = g_list_last((GTK_BOX(parent)->children));
758	child = ((GtkBoxChild *)child1->data)->widget;	749	child = ((GtkBoxChild *)child_list->data)->widget;
759	if (GTK_IS_ENTRY(child))	750	if (GTK_IS_ENTRY(child))
760	{	751	{
761	drawSquareButton(window,style,state_type,x,y,width,height);	752	drawSquareButton(window,style,state_type,x,y,width,height);

Lines 60-75 Link Here

(-)CMakeLists.txt (-10 lines)
60	MESSAGE(STATUS "Found GTK include dir: ${GTK_INCLUDE_DIR}")	60	MESSAGE(STATUS "Found GTK include dir: ${GTK_INCLUDE_DIR}")
61	MESSAGE(STATUS "Found GTK library dir: ${GTK_LIB_DIR}")	61	MESSAGE(STATUS "Found GTK library dir: ${GTK_LIB_DIR}")
62		62
63	# Find Bonobo
64	PKGCONFIG(libbonoboui-2.0 BONOBO_INCLUDE_DIR BONOBO_LIB_DIR BONOBO_LINK_FLAGS BONOBO_CFLAGS)
65	IF (NOT BONOBO_INCLUDE_DIR)
66	MESSAGE(STATUS "bonoboui not found. Some features of the theme engine will not work as intended.")
67	ELSE (NOT BONOBO_INCLUDE_DIR)
68	MESSAGE(STATUS "Found Bonobo include dir: ${BONOBO_INCLUDE_DIR}")
69	MESSAGE(STATUS "Found Bonobo library dir: ${BONOBO_LIB_DIR}")
70	SET(BONOBO_DEFINITIONS -D HAVE_BONOBO)
71	ENDIF (NOT BONOBO_INCLUDE_DIR)
72
73	# Find msgfmt	63	# Find msgfmt
74	SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)	64	SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
75	FIND_PACKAGE(Msgfmt REQUIRED)	65	FIND_PACKAGE(Msgfmt REQUIRED)