diff options
| author | nyamatongwe <unknown> | 2011-05-02 22:18:21 +1000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2011-05-02 22:18:21 +1000 |
| commit | da90f4795826d7d55759f757c08c8fb95239ed28 (patch) | |
| tree | 9a944d9b042c5a66e1344a5597cfd8d92338cac1 | |
| parent | 9d2653ab7decc2f1eb2568677bfcf0cc15e685c8 (diff) | |
| download | scintilla-mirror-da90f4795826d7d55759f757c08c8fb95239ed28.tar.gz | |
Retreated from turning gdk_cursor_unref into g_object_unref as this caused crashes.
| -rw-r--r-- | gtk/PlatGTK.cxx | 2 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index aaf10149b..d04b9eaad 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -2161,7 +2161,7 @@ void Window::SetCursor(Cursor curs) { if (WindowFromWidget(PWidget(wid))) gdk_window_set_cursor(WindowFromWidget(PWidget(wid)), gdkCurs); - g_object_unref(gdkCurs); + gdk_cursor_unref(gdkCurs); } void Window::SetTitle(const char *s) { diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 1d34aa5fb..5682fde64 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -435,7 +435,7 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) { gdk_window_set_background(gtk_widget_get_window(widget), &(gtk_widget_get_style(widget)->bg[GTK_STATE_NORMAL])); gdk_window_show(gtk_widget_get_window(widget)); - g_object_unref(cursor); + gdk_cursor_unref(cursor); // Deprecated: should chain up to parent class' "realize" implementation gtk_widget_style_attach(widget); #else @@ -444,7 +444,7 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) { gdk_window_set_user_data(widget->window, widget); gdk_window_set_background(widget->window, &widget->style->bg[GTK_STATE_NORMAL]); gdk_window_show(widget->window); - g_object_unref(cursor); + gdk_cursor_unref(cursor); widget->style = gtk_style_attach(widget->style, widget->window); #endif wPreedit = gtk_window_new(GTK_WINDOW_POPUP); @@ -476,15 +476,15 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) { cursor = gdk_cursor_new(GDK_XTERM); gdk_window_set_cursor(PWindow(wText), cursor); - g_object_unref(cursor); + gdk_cursor_unref(cursor); cursor = gdk_cursor_new(GDK_LEFT_PTR); gdk_window_set_cursor(PWindow(scrollbarv), cursor); - g_object_unref(cursor); + gdk_cursor_unref(cursor); cursor = gdk_cursor_new(GDK_LEFT_PTR); gdk_window_set_cursor(PWindow(scrollbarh), cursor); - g_object_unref(cursor); + gdk_cursor_unref(cursor); gtk_selection_add_targets(widget, GDK_SELECTION_PRIMARY, clipboardCopyTargets, nClipboardCopyTargets); |