From 000ba485228b1b7ad35eb1b3c63cf08189eb7c42 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 6 Jun 2013 13:45:33 +1000 Subject: Disable methods required for GTK+ 3 when building for GTK+ 2. --- gtk/ScintillaGTK.cxx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 7b039dc3c..49cf2c8cd 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -232,8 +232,10 @@ private: gint FocusOutThis(GtkWidget *widget); static gint FocusOut(GtkWidget *widget, GdkEventFocus *event); static void SizeRequest(GtkWidget *widget, GtkRequisition *requisition); +#if GTK_CHECK_VERSION(3,0,0) static void GetPreferredWidth(GtkWidget *widget, gint *minimalWidth, gint *naturalWidth); static void GetPreferredHeight(GtkWidget *widget, gint *minimalHeight, gint *naturalHeight); +#endif static void SizeAllocate(GtkWidget *widget, GtkAllocation *allocation); #if GTK_CHECK_VERSION(3,0,0) gboolean DrawTextThis(cairo_t *cr); @@ -678,6 +680,8 @@ void ScintillaGTK::SizeRequest(GtkWidget *widget, GtkRequisition *requisition) { #endif } +#if GTK_CHECK_VERSION(3,0,0) + void ScintillaGTK::GetPreferredWidth(GtkWidget *widget, gint *minimalWidth, gint *naturalWidth) { GtkRequisition requisition; SizeRequest(widget, &requisition); @@ -690,6 +694,8 @@ void ScintillaGTK::GetPreferredHeight(GtkWidget *widget, gint *minimalHeight, gi *minimalHeight = *naturalHeight = requisition.height; } +#endif + void ScintillaGTK::SizeAllocate(GtkWidget *widget, GtkAllocation *allocation) { ScintillaGTK *sciThis = ScintillaFromWidget(widget); try { -- cgit v1.2.3