Index: src/text/fmt/xp/fv_View.h =================================================================== --- src/text/fmt/xp/fv_View.h (revision 30458) +++ src/text/fmt/xp/fv_View.h (working copy) @@ -43,7 +43,7 @@ #include "fv_Selection.h" #include "fv_InlineImage.h" -#ifdef TOOLKIT_GTK +#ifdef TOOLKIT_GTK_ALL #include "fv_UnixVisualDrag.h" #include "fv_UnixFrameEdit.h" #include "fv_UnixInlineImage.h" @@ -1114,12 +1114,12 @@ mutable fv_PropCache m_BlockProps; mutable fv_PropCache m_SecProps; AV_ListenerId m_CaretListID; -#ifdef TOOLKIT_GTK +#ifdef TOOLKIT_GTK_ALL FV_UnixFrameEdit m_FrameEdit; #else FV_FrameEdit m_FrameEdit; #endif -#ifdef TOOLKIT_GTK +#ifdef TOOLKIT_GTK_ALL FV_UnixVisualDrag m_VisualDragText; #else FV_VisualDragText m_VisualDragText; @@ -1132,7 +1132,7 @@ bool m_bDontNotifyListeners; UT_ByteBuf * m_pLocalBuf; UT_sint32 m_iGrabCell; -#ifdef TOOLKIT_GTK +#ifdef TOOLKIT_GTK_ALL FV_UnixVisualInlineImage m_InlineImage; #else FV_VisualInlineImage m_InlineImage; Index: src/text/fmt/Makefile.am =================================================================== --- src/text/fmt/Makefile.am (revision 30458) +++ src/text/fmt/Makefile.am (working copy) @@ -1,8 +1,8 @@ DIST_SUBDIRS = gtk xp + +if TOOLKIT_GTK_ALL +SUBDIRS = gtk xp +else SUBDIRS = xp - -if TOOLKIT_GTK -SUBDIRS += gtk endif - Index: src/af/gr/xp/gr_Caret.cpp =================================================================== --- src/af/gr/xp/gr_Caret.cpp (revision 30458) +++ src/af/gr/xp/gr_Caret.cpp (working copy) @@ -32,7 +32,7 @@ #include "ut_debugmsg.h" static const UT_uint32 CURSOR_DELAY_TIME = 10; // milliseconds -#ifdef TOOLKIT_GTK +#ifdef TOOLKIT_GTK_ALL #include #elif defined(TOOLKIT_WIN) #include @@ -177,7 +177,7 @@ UT_uint32 GR_Caret::_getCursorBlinkTime() const { -#ifdef TOOLKIT_GTK +#ifdef TOOLKIT_GTK_ALL UT_uint32 blink; GtkSettings * settings = gtk_settings_get_default (); @@ -193,7 +193,7 @@ UT_uint32 GR_Caret::_getCursorBlinkTimeout() const { -#ifdef TOOLKIT_GTK +#ifdef TOOLKIT_GTK_ALL UT_uint32 timeout = 0; GtkSettings * settings = gtk_settings_get_default (); @@ -304,7 +304,7 @@ * If not, then _blink() won't actually clear the caret; it'll only draw. */ void GR_Caret::setBlink(bool bBlink) { -#ifdef TOOLKIT_GTK +#ifdef TOOLKIT_GTK_ALL gboolean can; GtkSettings * settings = gtk_settings_get_default (); Index: src/af/util/xp/ut_worker.cpp =================================================================== --- src/af/util/xp/ut_worker.cpp (revision 30458) +++ src/af/util/xp/ut_worker.cpp (working copy) @@ -129,7 +129,7 @@ // give preference to CAN_USE_IDLE -#if defined(SUPPORTS_UT_IDLE) || defined(TOOLKIT_GTK) +#if defined(SUPPORTS_UT_IDLE) || defined(TOOLKIT_GTK_ALL) if ( mode & IDLE ) { tmp = UT_Idle::static_constructor ( cb, data ); Index: src/wp/ap/xp/ap_TB_Layouts_FileEditOps.h =================================================================== --- src/wp/ap/xp/ap_TB_Layouts_FileEditOps.h (revision 30458) +++ src/wp/ap/xp/ap_TB_Layouts_FileEditOps.h (working copy) @@ -36,7 +36,7 @@ ToolbarItem(AP_TOOLBAR_ID_FILE_OPEN) ToolbarItem(AP_TOOLBAR_ID_FILE_SAVE) Spacer() -#if defined(TOOLKIT_GTK) || defined (TOOLKIT_WIN) +#if defined(TOOLKIT_GTK_ALL) || defined (TOOLKIT_WIN) ToolbarItem(AP_TOOLBAR_ID_FILE_PRINT_PREVIEW) #endif ToolbarItem(AP_TOOLBAR_ID_FILE_PRINT) Index: src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h =================================================================== --- src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h (revision 30458) +++ src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h (working copy) @@ -55,7 +55,7 @@ #ifdef ENABLE_PRINT Separator() MenuItem(AP_MENU_ID_FILE_PAGESETUP) -#if defined(TOOLKIT_GTK) || defined (TOOLKIT_WIN) +#if defined(TOOLKIT_GTK_ALL) || defined (TOOLKIT_WIN) MenuItem(AP_MENU_ID_FILE_PRINT_PREVIEW) #endif MenuItem(AP_MENU_ID_FILE_PRINT) @@ -64,7 +64,7 @@ Separator() MenuItem(AP_MENU_ID_FILE_PROPERTIES) Separator() -#ifdef TOOLKIT_GTK +#ifdef TOOLKIT_GTK_ALL // GNOME HIG style recent files MenuItem(AP_MENU_ID_FILE_RECENT_1) MenuItem(AP_MENU_ID_FILE_RECENT_2) @@ -190,7 +190,7 @@ MenuItem(AP_MENU_ID_INSERT_FILE) -#if defined(TOOLKIT_GTK) && !XAP_SIMPLE_MENU +#if defined(TOOLKIT_GTK_ALL) && !XAP_SIMPLE_MENU MenuItem(AP_MENU_ID_INSERT_CLIPART) #endif MenuItem(AP_MENU_ID_INSERT_GRAPHIC) @@ -445,10 +445,10 @@ MenuItem(AP_MENU_ID_HELP_CHECKVER) MenuItem(AP_MENU_ID_HELP_REPORT_BUG) Separator() -#ifdef TOOLKIT_GTK +#ifdef TOOLKIT_GTK_ALL MenuItem(AP_MENU_ID_HELP_ABOUT_GNOMEOFFICE) #endif -#ifndef TOOLKIT_GTK +#ifndef TOOLKIT_GTK_ALL MenuItem(AP_MENU_ID_HELP_CREDITS) #endif MenuItem(AP_MENU_ID_HELP_ABOUT) Index: src/wp/ap/xp/ap_LB_Default.cpp =================================================================== --- src/wp/ap/xp/ap_LB_Default.cpp (revision 30458) +++ src/wp/ap/xp/ap_LB_Default.cpp (working copy) @@ -193,7 +193,7 @@ // Button-2, Text-context // { context { click doubleclick drag, dbldrag, release, doublerelease }}, -#ifdef TOOLKIT_GTK +#ifdef TOOLKIT_GTK_ALL // special key binding for X11-style middle mouse selection (not to be confused with the clipboard) {_CT _B2, { "pasteSelection", "", "", "", "", "" }}, {_CH _B2, { "pasteSelection", "", "", "", "", "" }}, Index: src/wp/ap/xp/ap_EditMethods.cpp =================================================================== --- src/wp/ap/xp/ap_EditMethods.cpp (revision 30458) +++ src/wp/ap/xp/ap_EditMethods.cpp (working copy) @@ -3728,7 +3728,7 @@ Defun(closeWindow) { CHECK_FRAME; -#if !defined(TOOLKIT_GTK) +#if !defined(TOOLKIT_GTK_ALL) UT_return_val_if_fail (pAV_View, false); XAP_Frame * pFrame = static_cast ( pAV_View->getParentData()); UT_return_val_if_fail(pFrame, false); @@ -9793,11 +9793,11 @@ return s_doOptionsDlg(pView, 4); // spelling tab #endif -#if !defined (TOOLKIT_WIN) && !defined (TOOLKIT_GTK) +#if !defined (TOOLKIT_WIN) && !defined (TOOLKIT_GTK_ALL) return s_doOptionsDlg(pView, 1); // spelling tab #else // spelling tab in Windows in the tab num 2 - // becuase 1, is language selection. For UNIX, it's + // because 1, is language selection. For UNIX, it's // tab 2 as well. We should use an enumerator instead // of fixed values. Jordi, return s_doOptionsDlg(pView, 2); Index: src/wp/ap/xp/ap_Toolbar_ActionSet.cpp =================================================================== --- src/wp/ap/xp/ap_Toolbar_ActionSet.cpp (revision 30458) +++ src/wp/ap/xp/ap_Toolbar_ActionSet.cpp (working copy) @@ -81,7 +81,7 @@ _s(AP_TOOLBAR_ID_FILE_OPEN, EV_TBIT_PushButton, "fileOpen", AV_CHG_NONE, NULL); _s(AP_TOOLBAR_ID_FILE_SAVE, EV_TBIT_PushButton, "fileSave", AV_CHG_ALL, ap_ToolbarGetState_Changes); _s(AP_TOOLBAR_ID_FILE_SAVEAS, EV_TBIT_PushButton, "fileSaveAs", AV_CHG_NONE, NULL); -#if TOOLKIT_GTK +#if TOOLKIT_GTK_ALL _s(AP_TOOLBAR_ID_FILE_PRINT, EV_TBIT_PushButton, "cairoPrint", AV_CHG_NONE, NULL); _s(AP_TOOLBAR_ID_FILE_PRINT_PREVIEW, EV_TBIT_PushButton, "cairoPrintPreview", AV_CHG_NONE, NULL); #else Index: src/wp/ap/xp/ap_Menu_Layouts_Embedded.h =================================================================== --- src/wp/ap/xp/ap_Menu_Layouts_Embedded.h (revision 30458) +++ src/wp/ap/xp/ap_Menu_Layouts_Embedded.h (working copy) @@ -384,10 +384,10 @@ MenuItem(AP_MENU_ID_HELP_CHECKVER) MenuItem(AP_MENU_ID_HELP_REPORT_BUG) Separator() -#ifdef TOOLKIT_GTK +#ifdef TOOLKIT_GTK_ALL MenuItem(AP_MENU_ID_HELP_ABOUT_GNOMEOFFICE) #endif -#ifndef TOOLKIT_GTK +#ifndef TOOLKIT_GTK_ALL MenuItem(AP_MENU_ID_HELP_CREDITS) #endif #endif Index: src/wp/ap/xp/ap_Menu_ActionSet.cpp =================================================================== --- src/wp/ap/xp/ap_Menu_ActionSet.cpp (revision 30458) +++ src/wp/ap/xp/ap_Menu_ActionSet.cpp (working copy) @@ -85,7 +85,7 @@ _s(AP_MENU_ID_FILE_PROPERTIES, 0,1,0,0, "dlgMetaData", NULL, NULL); _s(AP_MENU_ID_FILE_CLOSE, 0,0,0,0, "closeWindow", NULL, NULL); _s(AP_MENU_ID_FILE_PAGESETUP, 0,1,0,0, "pageSetup", NULL, NULL); -#if TOOLKIT_GTK +#if TOOLKIT_GTK_ALL _s(AP_MENU_ID_FILE_PRINT, 0,1,0,0, "cairoPrint",NULL,NULL); _s(AP_MENU_ID_FILE_PRINT_PREVIEW, 0,1,0,0, "cairoPrintPreview", NULL, NULL); _s(AP_MENU_ID_FILE_PRINT_DIRECTLY, 0,1,0,0, "cairoPrintDirectly", NULL, NULL); Index: src/wp/ap/gtk2/ap_UnixDialog_InsertXMLID.cpp =================================================================== --- src/wp/ap/gtk2/ap_UnixDialog_InsertXMLID.cpp (revision 30458) +++ src/wp/ap/gtk2/ap_UnixDialog_InsertXMLID.cpp (working copy) @@ -52,6 +52,14 @@ #define BUTTON_INSERT 1 #include + +#if !GTK_CHECK_VERSION(2,22,0) +#define GDK_KEY_Delete GDK_Delete +#define GDK_KEY_BackSpace GDK_BackSpace +#define GDK_KEY_Left GDK_Left +#define GDK_KEY_Right GDK_Right +#endif + static gboolean __onKeyPressed( GtkWidget* widget, GdkEventKey* event, gpointer user_data ) Index: configure.in =================================================================== --- configure.in (revision 30458) +++ configure.in (working copy) @@ -444,7 +444,7 @@ ]) -redland_req='redland >= 1.0.10 rasqal >= 0.9.17' +redland_req='redland >= 1.0.12 rasqal >= 0.9.20' AC_ARG_WITH([redland], [AS_HELP_STRING([--with-redland], [use redland and raptor libraries])], [