[Libreoffice-commits] core.git: vcl/inc vcl/unx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 10 18:25:43 UTC 2021
vcl/inc/unx/gtk/gtkinst.hxx | 2
vcl/unx/gtk3/gtkinst.cxx | 338 --------------------------------------------
2 files changed, 5 insertions(+), 335 deletions(-)
New commits:
commit 958a39425faa7c5ec3c422ac0de9fac7f79cad8e
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 6 12:07:42 2021 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Aug 10 20:25:04 2021 +0200
gtk4: remove training wheels
Change-Id: Ib52a4cc56fafc23ced1ce4f27d2c69977471d1d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118491
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 5fb0b67b2b8f..581b1fe212c5 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -290,10 +290,8 @@ public:
virtual css::uno::Reference< css::uno::XInterface > CreateDropTarget() override;
virtual OpenGLContext* CreateOpenGLContext() override;
virtual weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString& rUIRoot, const OUString& rUIFile) override;
-#if !GTK_CHECK_VERSION(4, 0, 0)
virtual weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString& rUIRoot, const OUString& rUIFile,
bool bAllowCycleFocusOut, sal_uInt64 nLOKWindowId = 0) override;
-#endif
virtual weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonType, const OUString &rPrimaryMessage) override;
virtual weld::Window* GetFrameWeld(const css::uno::Reference<css::awt::XWindow>& rWindow) override;
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 6122cff7c871..238e2aa72571 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22474,338 +22474,6 @@ void GtkInstanceWidget::help_hierarchy_foreach(const std::function<bool(const OS
weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString& rUIRoot, const OUString& rUIFile)
{
-#if GTK_CHECK_VERSION(4, 0, 0)
- if (rUIFile != "cui/ui/aboutdialog.ui" &&
- rUIFile != "cui/ui/accelconfigpage.ui" &&
- rUIFile != "cui/ui/acorexceptpage.ui" &&
- rUIFile != "cui/ui/acoroptionspage.ui" &&
- rUIFile != "cui/ui/acorreplacepage.ui" &&
- rUIFile != "cui/ui/applyautofmtpage.ui" &&
- rUIFile != "cui/ui/applylocalizedpage.ui" &&
- rUIFile != "cui/ui/areadialog.ui" &&
- rUIFile != "cui/ui/areatabpage.ui" &&
- rUIFile != "cui/ui/asiantypography.ui" &&
- rUIFile != "cui/ui/autocorrectdialog.ui" &&
- rUIFile != "cui/ui/imagetabpage.ui" &&
- rUIFile != "cui/ui/borderpage.ui" &&
- rUIFile != "cui/ui/breaknumberoption.ui" &&
- rUIFile != "cui/ui/bulletandposition.ui" &&
- rUIFile != "cui/ui/cellalignment.ui" &&
- rUIFile != "cui/ui/charnamepage.ui" &&
- rUIFile != "cui/ui/colorpage.ui" &&
- rUIFile != "cui/ui/colorpickerdialog.ui" &&
- rUIFile != "cui/ui/customizedialog.ui" &&
- rUIFile != "cui/ui/editdictionarydialog.ui" &&
- rUIFile != "cui/ui/effectspage.ui" &&
- rUIFile != "cui/ui/eventassigndialog.ui" &&
- rUIFile != "cui/ui/eventassignpage.ui" &&
- rUIFile != "cui/ui/eventsconfigpage.ui" &&
- rUIFile != "cui/ui/fontfeaturesdialog.ui" &&
- rUIFile != "cui/ui/fontfragment.ui" &&
- rUIFile != "cui/ui/formatnumberdialog.ui" &&
- rUIFile != "cui/ui/gradientpage.ui" &&
- rUIFile != "cui/ui/hatchpage.ui" &&
- rUIFile != "cui/ui/hangulhanjaadddialog.ui" &&
- rUIFile != "cui/ui/hangulhanjaconversiondialog.ui" &&
- rUIFile != "cui/ui/hangulhanjaeditdictdialog.ui" &&
- rUIFile != "cui/ui/hangulhanjaoptdialog.ui" &&
- rUIFile != "cui/ui/hyperlinkdialog.ui" &&
- rUIFile != "cui/ui/hyperlinkdocpage.ui" &&
- rUIFile != "cui/ui/hyperlinkinternetpage.ui" &&
- rUIFile != "cui/ui/hyperlinkmarkdialog.ui" &&
- rUIFile != "cui/ui/hyperlinkmailpage.ui" &&
- rUIFile != "cui/ui/hyperlinknewdocpage.ui" &&
- rUIFile != "cui/ui/hyphenate.ui" &&
- rUIFile != "cui/ui/insertfloatingframe.ui" &&
- rUIFile != "cui/ui/insertoleobject.ui" &&
- rUIFile != "cui/ui/insertrowcolumn.ui" &&
- rUIFile != "cui/ui/linedialog.ui" &&
- rUIFile != "cui/ui/lineendstabpage.ui" &&
- rUIFile != "cui/ui/linestyletabpage.ui" &&
- rUIFile != "cui/ui/linetabpage.ui" &&
- rUIFile != "cui/ui/macroassigndialog.ui" &&
- rUIFile != "cui/ui/macroassignpage.ui" &&
- rUIFile != "cui/ui/macroselectordialog.ui" &&
- rUIFile != "cui/ui/menuassignpage.ui" &&
- rUIFile != "cui/ui/movemenu.ui" &&
- rUIFile != "cui/ui/namedialog.ui" &&
- rUIFile != "cui/ui/newlibdialog.ui" &&
- rUIFile != "cui/ui/newtabledialog.ui" &&
- rUIFile != "cui/ui/numberingformatpage.ui" &&
- rUIFile != "cui/ui/numberingoptionspage.ui" &&
- rUIFile != "cui/ui/numberingpositionpage.ui" &&
- rUIFile != "cui/ui/objectnamedialog.ui" &&
- rUIFile != "cui/ui/objecttitledescdialog.ui" &&
- rUIFile != "cui/ui/optjsearchpage.ui" &&
- rUIFile != "cui/ui/optlingupage.ui" &&
- rUIFile != "cui/ui/optnewdictionarydialog.ui" &&
- rUIFile != "cui/ui/pageformatpage.ui" &&
- rUIFile != "cui/ui/paragalignpage.ui" &&
- rUIFile != "cui/ui/paraindentspacing.ui" &&
- rUIFile != "cui/ui/paratabspage.ui" &&
- rUIFile != "cui/ui/pastespecial.ui" &&
- rUIFile != "cui/ui/patterntabpage.ui" &&
- rUIFile != "cui/ui/percentdialog.ui" &&
- rUIFile != "cui/ui/pickbulletpage.ui" &&
- rUIFile != "cui/ui/pickgraphicpage.ui" &&
- rUIFile != "cui/ui/picknumberingpage.ui" &&
- rUIFile != "cui/ui/pickoutlinepage.ui" &&
- rUIFile != "cui/ui/positionpage.ui" &&
- rUIFile != "cui/ui/qrcodegen.ui" &&
- rUIFile != "cui/ui/scriptorganizer.ui" &&
- rUIFile != "cui/ui/searchattrdialog.ui" &&
- rUIFile != "cui/ui/searchformatdialog.ui" &&
- rUIFile != "cui/ui/selectpathdialog.ui" &&
- rUIFile != "cui/ui/shadowtabpage.ui" &&
- rUIFile != "cui/ui/signatureline.ui" &&
- rUIFile != "cui/ui/similaritysearchdialog.ui" &&
- rUIFile != "cui/ui/specialcharacters.ui" &&
- rUIFile != "cui/ui/spellingdialog.ui" &&
- rUIFile != "cui/ui/spelloptionsdialog.ui" &&
- rUIFile != "cui/ui/spinbox.ui" &&
- rUIFile != "cui/ui/splitcellsdialog.ui" &&
- rUIFile != "cui/ui/textattrtabpage.ui" &&
- rUIFile != "cui/ui/textanimtabpage.ui" &&
- rUIFile != "cui/ui/textcolumnstabpage.ui" &&
- rUIFile != "cui/ui/textdialog.ui" &&
- rUIFile != "cui/ui/textflowpage.ui" &&
- rUIFile != "cui/ui/thesaurus.ui" &&
- rUIFile != "cui/ui/tipofthedaydialog.ui" &&
- rUIFile != "cui/ui/toolbarmodedialog.ui" &&
- rUIFile != "cui/ui/transparencytabpage.ui" &&
- rUIFile != "cui/ui/twolinespage.ui" &&
- rUIFile != "cui/ui/wordcompletionpage.ui" &&
- rUIFile != "cui/ui/zoomdialog.ui" &&
- rUIFile != "desktop/ui/extensionmanager.ui" &&
- rUIFile != "desktop/ui/updatedialog.ui" &&
- rUIFile != "filter/ui/pdfgeneralpage.ui" &&
- rUIFile != "filter/ui/pdfsecuritypage.ui" &&
- rUIFile != "filter/ui/pdfsignpage.ui" &&
- rUIFile != "filter/ui/pdflinkspage.ui" &&
- rUIFile != "filter/ui/pdfoptionsdialog.ui" &&
- rUIFile != "filter/ui/pdfuserinterfacepage.ui" &&
- rUIFile != "filter/ui/pdfviewpage.ui" &&
- rUIFile != "filter/ui/testxmlfilter.ui" &&
- rUIFile != "filter/ui/xmlfiltersettings.ui" &&
- rUIFile != "filter/ui/xmlfiltertabpagegeneral.ui" &&
- rUIFile != "filter/ui/xmlfiltertabpagetransformation.ui" &&
- rUIFile != "filter/ui/xsltfilterdialog.ui" &&
- rUIFile != "sfx/ui/custominfopage.ui" &&
- rUIFile != "sfx/ui/descriptioninfopage.ui" &&
- rUIFile != "sfx/ui/documentfontspage.ui" &&
- rUIFile != "sfx/ui/documentinfopage.ui" &&
- rUIFile != "sfx/ui/documentpropertiesdialog.ui" &&
- rUIFile != "sfx/ui/inputdialog.ui" &&
- rUIFile != "sfx/ui/querysavedialog.ui" &&
- rUIFile != "sfx/ui/licensedialog.ui" &&
- rUIFile != "sfx/ui/linefragment.ui" &&
- rUIFile != "sfx/ui/loadtemplatedialog.ui" &&
- rUIFile != "sfx/ui/managestylepage.ui" &&
- rUIFile != "sfx/ui/panel.ui" &&
- rUIFile != "sfx/ui/password.ui" &&
- rUIFile != "sfx/ui/printeroptionsdialog.ui" &&
- rUIFile != "sfx/ui/safemodequerydialog.ui" &&
- rUIFile != "sfx/ui/saveastemplatedlg.ui" &&
- rUIFile != "sfx/ui/securityinfopage.ui" &&
- rUIFile != "sfx/ui/singletabdialog.ui" &&
- rUIFile != "sfx/ui/templatecategorydlg.ui" &&
- rUIFile != "sfx/ui/templatedlg.ui" &&
- rUIFile != "sfx/ui/versioncommentdialog.ui" &&
- rUIFile != "sfx/ui/versionsofdialog.ui" &&
- rUIFile != "svt/ui/addresstemplatedialog.ui" &&
- rUIFile != "svt/ui/datewindow.ui" &&
- rUIFile != "svt/ui/javadisableddialog.ui" &&
- rUIFile != "svt/ui/linewindow.ui" &&
- rUIFile != "svt/ui/printersetupdialog.ui" &&
- rUIFile != "svx/ui/accessibilitycheckdialog.ui" &&
- rUIFile != "svx/ui/accessibilitycheckentry.ui" &&
- rUIFile != "svx/ui/asianphoneticguidedialog.ui" &&
- rUIFile != "svx/ui/chineseconversiondialog.ui" &&
- rUIFile != "svx/ui/chinesedictionary.ui" &&
- rUIFile != "svx/ui/colorwindow.ui" &&
- rUIFile != "svx/ui/docrecoverybrokendialog.ui" &&
- rUIFile != "svx/ui/docrecoveryprogressdialog.ui" &&
- rUIFile != "svx/ui/docrecoveryrecoverdialog.ui" &&
- rUIFile != "svx/ui/docrecoverysavedialog.ui" &&
- rUIFile != "svx/ui/findreplacedialog.ui" &&
- rUIFile != "svx/ui/fontworkgallerydialog.ui" &&
- rUIFile != "svx/ui/headfootformatpage.ui" &&
- rUIFile != "modules/BasicIDE/ui/basicmacrodialog.ui" &&
- rUIFile != "modules/BasicIDE/ui/dialogpage.ui" &&
- rUIFile != "modules/BasicIDE/ui/libpage.ui" &&
- rUIFile != "modules/BasicIDE/ui/modulepage.ui" &&
- rUIFile != "modules/BasicIDE/ui/newlibdialog.ui" &&
- rUIFile != "modules/BasicIDE/ui/organizedialog.ui" &&
- rUIFile != "modules/scalc/ui/advancedfilterdialog.ui" &&
- rUIFile != "modules/scalc/ui/analysisofvariancedialog.ui" &&
- rUIFile != "modules/scalc/ui/cellprotectionpage.ui" &&
- rUIFile != "modules/scalc/ui/checkwarningdialog.ui" &&
- rUIFile != "modules/scalc/ui/colwidthdialog.ui" &&
- rUIFile != "modules/scalc/ui/consolidatedialog.ui" &&
- rUIFile != "modules/scalc/ui/correlationdialog.ui" &&
- rUIFile != "modules/scalc/ui/dataform.ui" &&
- rUIFile != "modules/scalc/ui/dataformfragment.ui" &&
- rUIFile != "modules/scalc/ui/datastreams.ui" &&
- rUIFile != "modules/scalc/ui/definedatabaserangedialog.ui" &&
- rUIFile != "modules/scalc/ui/deletecells.ui" &&
- rUIFile != "modules/scalc/ui/deletecontents.ui" &&
- rUIFile != "modules/scalc/ui/descriptivestatisticsdialog.ui" &&
- rUIFile != "modules/scalc/ui/doubledialog.ui" &&
- rUIFile != "modules/scalc/ui/erroralerttabpage.ui" &&
- rUIFile != "modules/scalc/ui/externaldata.ui" &&
- rUIFile != "modules/scalc/ui/formatcellsdialog.ui" &&
- rUIFile != "modules/scalc/ui/goalseekdlg.ui" &&
- rUIFile != "modules/scalc/ui/groupdialog.ui" &&
- rUIFile != "modules/scalc/ui/headerfootercontent.ui" &&
- rUIFile != "modules/scalc/ui/headerfooterdialog.ui" &&
- rUIFile != "modules/scalc/ui/inputstringdialog.ui" &&
- rUIFile != "modules/scalc/ui/insertname.ui" &&
- rUIFile != "modules/scalc/ui/insertcells.ui" &&
- rUIFile != "modules/scalc/ui/insertsheet.ui" &&
- rUIFile != "modules/scalc/ui/integerdialog.ui" &&
- rUIFile != "modules/scalc/ui/movecopysheet.ui" &&
- rUIFile != "modules/scalc/ui/optimalcolwidthdialog.ui" &&
- rUIFile != "modules/scalc/ui/optimalrowheightdialog.ui" &&
- rUIFile != "modules/scalc/ui/pagetemplatedialog.ui" &&
- rUIFile != "modules/scalc/ui/pastespecial.ui" &&
- rUIFile != "modules/scalc/ui/pivottablelayoutdialog.ui" &&
- rUIFile != "modules/scalc/ui/printareasdialog.ui" &&
- rUIFile != "modules/scalc/ui/protectsheetdlg.ui" &&
- rUIFile != "modules/scalc/ui/randomnumbergenerator.ui" &&
- rUIFile != "modules/scalc/ui/rowheightdialog.ui" &&
- rUIFile != "modules/scalc/ui/samplingdialog.ui" &&
- rUIFile != "modules/scalc/ui/sharedocumentdlg.ui" &&
- rUIFile != "modules/scalc/ui/sheetprintpage.ui" &&
- rUIFile != "modules/scalc/ui/selectrange.ui" &&
- rUIFile != "modules/scalc/ui/selectsource.ui" &&
- rUIFile != "modules/scalc/ui/showsheetdialog.ui" &&
- rUIFile != "modules/scalc/ui/solverdlg.ui" &&
- rUIFile != "modules/scalc/ui/solveroptionsdialog.ui" &&
- rUIFile != "modules/scalc/ui/sortcriteriapage.ui" &&
- rUIFile != "modules/scalc/ui/sortdialog.ui" &&
- rUIFile != "modules/scalc/ui/sortkey.ui" &&
- rUIFile != "modules/scalc/ui/sortoptionspage.ui" &&
- rUIFile != "modules/scalc/ui/standardfilterdialog.ui" &&
- rUIFile != "modules/scalc/ui/subtotaldialog.ui" &&
- rUIFile != "modules/scalc/ui/subtotalgrppage.ui" &&
- rUIFile != "modules/scalc/ui/subtotaloptionspage.ui" &&
- rUIFile != "modules/scalc/ui/validationcriteriapage.ui" &&
- rUIFile != "modules/scalc/ui/validationdialog.ui" &&
- rUIFile != "modules/scalc/ui/validationhelptabpage.ui" &&
- rUIFile != "modules/scalc/ui/xmlsourcedialog.ui" &&
- rUIFile != "modules/sdraw/ui/dlgsnap.ui" &&
- rUIFile != "modules/sdraw/ui/drawchardialog.ui" &&
- rUIFile != "modules/sdraw/ui/drawpagedialog.ui" &&
- rUIFile != "modules/sdraw/ui/drawparadialog.ui" &&
- rUIFile != "modules/simpress/ui/customslideshows.ui" &&
- rUIFile != "modules/simpress/ui/definecustomslideshow.ui" &&
- rUIFile != "modules/simpress/ui/headerfooterdialog.ui" &&
- rUIFile != "modules/simpress/ui/headerfootertab.ui" &&
- rUIFile != "modules/simpress/ui/masterlayoutdlg.ui" &&
- rUIFile != "modules/simpress/ui/presentationdialog.ui" &&
- rUIFile != "modules/simpress/ui/slidedesigndialog.ui" &&
- rUIFile != "modules/smath/ui/alignmentdialog.ui" &&
- rUIFile != "modules/smath/ui/catalogdialog.ui" &&
- rUIFile != "modules/smath/ui/fontdialog.ui" &&
- rUIFile != "modules/smath/ui/fontsizedialog.ui" &&
- rUIFile != "modules/smath/ui/fonttypedialog.ui" &&
- rUIFile != "modules/smath/ui/savedefaultsdialog.ui" &&
- rUIFile != "modules/smath/ui/smathsettings.ui" &&
- rUIFile != "modules/smath/ui/spacingdialog.ui" &&
- rUIFile != "modules/smath/ui/symdefinedialog.ui" &&
- rUIFile != "modules/swriter/ui/autoformattable.ui" &&
- rUIFile != "modules/swriter/ui/autotext.ui" &&
- rUIFile != "modules/swriter/ui/bibliographyentry.ui" &&
- rUIFile != "modules/swriter/ui/bulletsandnumbering.ui" &&
- rUIFile != "modules/swriter/ui/businessdatapage.ui" &&
- rUIFile != "modules/swriter/ui/cardmediumpage.ui" &&
- rUIFile != "modules/swriter/ui/characterproperties.ui" &&
- rUIFile != "modules/swriter/ui/charurlpage.ui" &&
- rUIFile != "modules/swriter/ui/columndialog.ui" &&
- rUIFile != "modules/swriter/ui/columnpage.ui" &&
- rUIFile != "modules/swriter/ui/columnwidth.ui" &&
- rUIFile != "modules/swriter/ui/comboboxfragment.ui" &&
- rUIFile != "modules/swriter/ui/converttexttable.ui" &&
- rUIFile != "modules/swriter/ui/dropcapspage.ui" &&
- rUIFile != "modules/swriter/ui/editcategories.ui" &&
- rUIFile != "modules/swriter/ui/endnotepage.ui" &&
- rUIFile != "modules/swriter/ui/exchangedatabases.ui" &&
- rUIFile != "modules/swriter/ui/fielddialog.ui" &&
- rUIFile != "modules/swriter/ui/flddbpage.ui" &&
- rUIFile != "modules/swriter/ui/flddocumentpage.ui" &&
- rUIFile != "modules/swriter/ui/flddocinfopage.ui" &&
- rUIFile != "modules/swriter/ui/fldfuncpage.ui" &&
- rUIFile != "modules/swriter/ui/fldrefpage.ui" &&
- rUIFile != "modules/swriter/ui/fldvarpage.ui" &&
- rUIFile != "modules/swriter/ui/footendnotedialog.ui" &&
- rUIFile != "modules/swriter/ui/footnoteareapage.ui" &&
- rUIFile != "modules/swriter/ui/footnotepage.ui" &&
- rUIFile != "modules/swriter/ui/footnotesendnotestabpage.ui" &&
- rUIFile != "modules/swriter/ui/formattablepage.ui" &&
- rUIFile != "modules/swriter/ui/framedialog.ui" &&
- rUIFile != "modules/swriter/ui/frmaddpage.ui" &&
- rUIFile != "modules/swriter/ui/frmtypepage.ui" &&
- rUIFile != "modules/swriter/ui/frmurlpage.ui" &&
- rUIFile != "modules/swriter/ui/gotopagedialog.ui" &&
- rUIFile != "modules/swriter/ui/indentpage.ui" &&
- rUIFile != "modules/swriter/ui/indexentry.ui" &&
- rUIFile != "modules/swriter/ui/insertbookmark.ui" &&
- rUIFile != "modules/swriter/ui/insertbreak.ui" &&
- rUIFile != "modules/swriter/ui/insertfootnote.ui" &&
- rUIFile != "modules/swriter/ui/insertsectiondialog.ui" &&
- rUIFile != "modules/swriter/ui/inserttable.ui" &&
- rUIFile != "modules/swriter/ui/labeldialog.ui" &&
- rUIFile != "modules/swriter/ui/labelformatpage.ui" &&
- rUIFile != "modules/swriter/ui/labeloptionspage.ui" &&
- rUIFile != "modules/swriter/ui/linenumbering.ui" &&
- rUIFile != "modules/swriter/ui/newuserindexdialog.ui" &&
- rUIFile != "modules/swriter/ui/numberingnamedialog.ui" &&
- rUIFile != "modules/swriter/ui/numparapage.ui" &&
- rUIFile != "modules/swriter/ui/outlinenumbering.ui" &&
- rUIFile != "modules/swriter/ui/outlinenumberingpage.ui" &&
- rUIFile != "modules/swriter/ui/outlinepositionpage.ui" &&
- rUIFile != "modules/swriter/ui/pagefooterpanel.ui" &&
- rUIFile != "modules/swriter/ui/pageformatpanel.ui" &&
- rUIFile != "modules/swriter/ui/pageheaderpanel.ui" &&
- rUIFile != "modules/swriter/ui/pagestylespanel.ui" &&
- rUIFile != "modules/swriter/ui/paradialog.ui" &&
- rUIFile != "modules/swriter/ui/printeroptions.ui" &&
- rUIFile != "modules/swriter/ui/printoptionspage.ui" &&
- rUIFile != "modules/swriter/ui/privateuserpage.ui" &&
- rUIFile != "modules/swriter/ui/renameautotextdialog.ui" &&
- rUIFile != "modules/swriter/ui/renameobjectdialog.ui" &&
- rUIFile != "modules/swriter/ui/rowheight.ui" &&
- rUIFile != "modules/swriter/ui/savelabeldialog.ui" &&
- rUIFile != "modules/swriter/ui/sectionpage.ui" &&
- rUIFile != "modules/swriter/ui/sortdialog.ui" &&
- rUIFile != "modules/swriter/ui/splittable.ui" &&
- rUIFile != "modules/swriter/ui/statisticsinfopage.ui" &&
- rUIFile != "modules/swriter/ui/tablecolumnpage.ui" &&
- rUIFile != "modules/swriter/ui/tableproperties.ui" &&
- rUIFile != "modules/swriter/ui/tabletextflowpage.ui" &&
- rUIFile != "modules/swriter/ui/templatedialog2.ui" &&
- rUIFile != "modules/swriter/ui/templatedialog8.ui" &&
- rUIFile != "modules/swriter/ui/templatedialog16.ui" &&
- rUIFile != "modules/swriter/ui/textgridpage.ui" &&
- rUIFile != "modules/swriter/ui/titlepage.ui" &&
- rUIFile != "modules/swriter/ui/watermarkdialog.ui" &&
- rUIFile != "modules/swriter/ui/wrappage.ui" &&
- rUIFile != "modules/swriter/ui/wordcount.ui" &&
- rUIFile != "vcl/ui/printdialog.ui" &&
- rUIFile != "vcl/ui/printerdevicepage.ui" &&
- rUIFile != "vcl/ui/printerpaperpage.ui" &&
- rUIFile != "vcl/ui/printerpropertiesdialog.ui" &&
- rUIFile != "writerperfect/ui/exportepub.ui" &&
- rUIFile != "xmlsec/ui/certdetails.ui" &&
- rUIFile != "xmlsec/ui/certgeneral.ui" &&
- rUIFile != "xmlsec/ui/digitalsignaturesdialog.ui" &&
- rUIFile != "xmlsec/ui/selectcertificatedialog.ui" &&
- rUIFile != "xmlsec/ui/viewcertdialog.ui")
- {
- SAL_WARN( "vcl.gtk", rUIFile);
- return SalInstance::CreateBuilder(pParent, rUIRoot, rUIFile);
- }
-#endif
GtkInstanceWidget* pParentWidget = dynamic_cast<GtkInstanceWidget*>(pParent);
GtkWidget* pBuilderParent = pParentWidget ? pParentWidget->getWidget() : nullptr;
return new GtkInstanceBuilder(pBuilderParent, rUIRoot, rUIFile, nullptr, true);
@@ -22864,6 +22532,7 @@ gboolean GtkSalFrame::NativeWidgetHelpPressed(GtkAccelGroup*, GObject*, guint, G
pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), xTemp.get());
return true;
}
+#endif
weld::Builder* GtkInstance::CreateInterimBuilder(vcl::Window* pParent, const OUString& rUIRoot, const OUString& rUIFile,
bool bAllowCycleFocusOut, sal_uInt64)
@@ -22881,12 +22550,15 @@ weld::Builder* GtkInstance::CreateInterimBuilder(vcl::Window* pParent, const OUS
return nullptr;
GtkWidget *pWindow = static_cast<GtkWidget*>(pEnvData->pWidget);
+#if !GTK_CHECK_VERSION(4, 0, 0)
gtk_widget_show_all(pWindow);
+#else
+ gtk_widget_show(pWindow);
+#endif
// build the widget tree as a child of the GtkEventBox GtkGrid parent
return new GtkInstanceBuilder(pWindow, rUIRoot, rUIFile, xEmbedWindow.get(), bAllowCycleFocusOut);
}
-#endif
weld::MessageDialog* GtkInstance::CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonsType, const OUString &rPrimaryMessage)
{
More information about the Libreoffice-commits
mailing list