diff options
| -rw-r--r-- | gtk/PlatGTK.cxx | 8 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 25 |
2 files changed, 2 insertions, 31 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index c63583cf3..3cb81ceab 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -42,12 +42,6 @@ #include "Converter.h" -#if GTK_CHECK_VERSION(2,20,0) -#define IS_WIDGET_FOCUSSED(w) (gtk_widget_has_focus(GTK_WIDGET(w))) -#else -#define IS_WIDGET_FOCUSSED(w) (GTK_WIDGET_HAS_FOCUS(w)) -#endif - static const double kPi = 3.14159265358979323846; // The Pango version guard for pango_units_from_double and pango_units_to_double @@ -1246,7 +1240,7 @@ void Window::Destroy() { } bool Window::HasFocus() { - return IS_WIDGET_FOCUSSED(wid); + return gtk_widget_has_focus(GTK_WIDGET(wid)); } PRectangle Window::GetPosition() { diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 01667d849..5b79cef7f 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -83,11 +83,9 @@ #if GTK_CHECK_VERSION(2,20,0) #define IS_WIDGET_REALIZED(w) (gtk_widget_get_realized(GTK_WIDGET(w))) #define IS_WIDGET_MAPPED(w) (gtk_widget_get_mapped(GTK_WIDGET(w))) -#define IS_WIDGET_VISIBLE(w) (gtk_widget_get_visible(GTK_WIDGET(w))) #else #define IS_WIDGET_REALIZED(w) (GTK_WIDGET_REALIZED(w)) #define IS_WIDGET_MAPPED(w) (GTK_WIDGET_MAPPED(w)) -#define IS_WIDGET_VISIBLE(w) (GTK_WIDGET_VISIBLE(w)) #endif #define SC_INDICATOR_INPUT INDIC_IME @@ -573,7 +571,7 @@ void ScintillaGTK::UnRealize(GtkWidget *widget) { static void MapWidget(GtkWidget *widget) { if (widget && - IS_WIDGET_VISIBLE(widget) && + gtk_widget_get_visible(GTK_WIDGET(widget)) && !IS_WIDGET_MAPPED(widget)) { gtk_widget_map(widget); } @@ -752,11 +750,7 @@ void ScintillaGTK::GetPreferredHeight(GtkWidget *widget, gint *minimalHeight, gi void ScintillaGTK::SizeAllocate(GtkWidget *widget, GtkAllocation *allocation) { ScintillaGTK *sciThis = ScintillaFromWidget(widget); try { -#if GTK_CHECK_VERSION(2,20,0) gtk_widget_set_allocation(widget, allocation); -#else - widget->allocation = *allocation; -#endif if (IS_WIDGET_REALIZED(widget)) gdk_window_move_resize(WindowFromWidget(widget), allocation->x, @@ -776,13 +770,8 @@ void ScintillaGTK::Initialise() { parentClass = reinterpret_cast<GtkWidgetClass *>( g_type_class_ref(gtk_container_get_type())); -#if GTK_CHECK_VERSION(2,20,0) gtk_widget_set_can_focus(PWidget(wMain), TRUE); gtk_widget_set_sensitive(PWidget(wMain), TRUE); -#else - GTK_WIDGET_SET_FLAGS(PWidget(wMain), GTK_CAN_FOCUS); - GTK_WIDGET_SET_FLAGS(GTK_WIDGET(PWidget(wMain)), GTK_SENSITIVE); -#endif gtk_widget_set_events(PWidget(wMain), GDK_EXPOSURE_MASK | GDK_SCROLL_MASK @@ -826,11 +815,7 @@ void ScintillaGTK::Initialise() { #else scrollbarv = gtk_vscrollbar_new(GTK_ADJUSTMENT(adjustmentv)); #endif -#if GTK_CHECK_VERSION(2,20,0) gtk_widget_set_can_focus(PWidget(scrollbarv), FALSE); -#else - GTK_WIDGET_UNSET_FLAGS(PWidget(scrollbarv), GTK_CAN_FOCUS); -#endif g_signal_connect(G_OBJECT(adjustmentv), "value_changed", G_CALLBACK(ScrollSignal), this); gtk_widget_set_parent(PWidget(scrollbarv), PWidget(wMain)); @@ -842,11 +827,7 @@ void ScintillaGTK::Initialise() { #else scrollbarh = gtk_hscrollbar_new(GTK_ADJUSTMENT(adjustmenth)); #endif -#if GTK_CHECK_VERSION(2,20,0) gtk_widget_set_can_focus(PWidget(scrollbarh), FALSE); -#else - GTK_WIDGET_UNSET_FLAGS(PWidget(scrollbarh), GTK_CAN_FOCUS); -#endif g_signal_connect(G_OBJECT(adjustmenth), "value_changed", G_CALLBACK(ScrollHSignal), this); gtk_widget_set_parent(PWidget(scrollbarh), PWidget(wMain)); @@ -3270,11 +3251,7 @@ static void scintilla_class_init(ScintillaClass *klass) { static void scintilla_init(ScintillaObject *sci) { try { -#if GTK_CHECK_VERSION(2,20,0) gtk_widget_set_can_focus(GTK_WIDGET(sci), TRUE); -#else - GTK_WIDGET_SET_FLAGS(sci, GTK_CAN_FOCUS); -#endif sci->pscin = new ScintillaGTK(sci); } catch (...) { } |