summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/desktop-widget.cpp132
-rw-r--r--src/widgets/ege-adjustment-action.cpp3
-rw-r--r--src/widgets/ink-comboboxentry-action.cpp3
3 files changed, 60 insertions, 78 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 9b28e1424..7777b291f 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -28,6 +28,9 @@
#include <gtkmm/messagedialog.h>
#include <gtkmm/paned.h>
+#include <gdkmm/seat.h>
+#include <gdkmm/types.h>
+
#include <2geom/rect.h>
#include "attributes.h"
@@ -237,20 +240,21 @@ SPDesktopWidget::setMessage (Inkscape::MessageType type, const gchar *message)
Geom::Point
SPDesktopWidget::window_get_pointer()
{
- gint x,y;
- auto window = gtk_widget_get_window(GTK_WIDGET(canvas));
- auto display = gdk_window_get_display(window);
+ int x, y;
+ auto window = Glib::wrap(GTK_WIDGET(canvas))->get_window();
+ auto display = window->get_display();
#if GTK_CHECK_VERSION(3,20,0)
- auto seat = gdk_display_get_default_seat(display);
- auto device = gdk_seat_get_pointer(seat);
+ auto seat = display->get_default_seat();
+ auto device = seat->get_pointer();
#else
- auto dm = gdk_display_get_device_manager(display);
- auto device = gdk_device_manager_get_client_pointer(dm);
+ auto dm = display->get_device_manager();
+ auto device = dm->get_client_pointer();
#endif
- gdk_window_get_device_position(window, device, &x, &y, NULL);
+ Gdk::ModifierType m;
+ window->get_device_position(device, x, y, m);
- return Geom::Point(x,y);
+ return Geom::Point(x, y);
}
static GTimer *overallTimer = 0;
@@ -1080,38 +1084,28 @@ SPDesktopWidget::shutdown()
if (INKSCAPE.sole_desktop_for_document(*desktop)) {
SPDocument *doc = desktop->doc();
if (doc->isModifiedSinceSave()) {
- GtkWidget *dialog;
-
- /** \todo
- * FIXME !!! obviously this will have problems if the document
- * name contains markup characters
- */
- dialog = gtk_message_dialog_new_with_markup(
- GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(this))),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_NONE,
+ Gtk::Window *toplevel_window = Glib::wrap(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(this))));
+ Glib::ustring message = g_markup_printf_escaped(
_("<span weight=\"bold\" size=\"larger\">Save changes to document \"%s\" before closing?</span>\n\n"
"If you close without saving, your changes will be discarded."),
doc->getName());
+ Gtk::MessageDialog dialog = Gtk::MessageDialog(*toplevel_window, message, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
+ dialog.property_destroy_with_parent() = true;
+
// fix for bug lp:168809
- GtkWidget *ma = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog));
- std::vector<Gtk::Widget*> ma_labels = Glib::wrap(GTK_CONTAINER(ma))->get_children();
- GtkWidget *label = GTK_WIDGET(ma_labels[0]->gobj());
- gtk_widget_set_can_focus(label, FALSE);
+ Gtk::Container *ma = dialog.get_message_area();
+ std::vector<Gtk::Widget*> ma_labels = ma->get_children();
+ ma_labels[0]->set_can_focus(false);
- GtkWidget *close_button;
- close_button = gtk_button_new_with_mnemonic(_("Close _without saving"));
- gtk_widget_show(close_button);
- gtk_dialog_add_action_widget(GTK_DIALOG(dialog), close_button, GTK_RESPONSE_NO);
+ Gtk::Button close_button(_("Close _without saving"), true);
+ close_button.show();
+ dialog.add_action_widget(close_button, Gtk::RESPONSE_NO);
- gtk_dialog_add_button(GTK_DIALOG(dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
- gtk_dialog_add_button(GTK_DIALOG(dialog), _("_Save"), GTK_RESPONSE_YES);
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES);
+ dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
+ dialog.add_button(_("_Save"), Gtk::RESPONSE_YES);
+ dialog.set_default_response(Gtk::RESPONSE_YES);
- gint response;
- response = gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ gint response = dialog.run();
switch (response) {
case GTK_RESPONSE_YES:
@@ -1139,41 +1133,32 @@ SPDesktopWidget::shutdown()
/* Code to check data loss */
bool allow_data_loss = FALSE;
while (doc->getReprRoot()->attribute("inkscape:dataloss") != NULL && allow_data_loss == FALSE) {
- GtkWidget *dialog;
-
- /** \todo
- * FIXME !!! obviously this will have problems if the document
- * name contains markup characters
- */
- dialog = gtk_message_dialog_new_with_markup(
- GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(this))),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_NONE,
+ Gtk::Window *toplevel_window = Glib::wrap(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(this))));
+ Glib::ustring message = g_markup_printf_escaped(
_("<span weight=\"bold\" size=\"larger\">The file \"%s\" was saved with a format that may cause data loss!</span>\n\n"
"Do you want to save this file as Inkscape SVG?"),
doc->getName() ? doc->getName() : "Unnamed");
+ Gtk::MessageDialog dialog = Gtk::MessageDialog(*toplevel_window, message, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
+ dialog.property_destroy_with_parent() = true;
+
// fix for bug lp:168809
- GtkWidget *ma = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog));
- std::vector<Gtk::Widget*> ma_labels = Glib::wrap(GTK_CONTAINER(ma))->get_children();
- GtkWidget *label = GTK_WIDGET(ma_labels[0]->gobj());
- gtk_widget_set_can_focus(label, FALSE);
-
- GtkWidget *close_button;
- close_button = gtk_button_new_with_mnemonic(_("Close _without saving"));
- gtk_widget_show(close_button);
- GtkWidget *save_button = gtk_button_new_with_mnemonic(_("_Save as Inkscape SVG"));
- gtk_widget_set_can_default(save_button, TRUE);
- gtk_widget_show(save_button);
- gtk_dialog_add_action_widget(GTK_DIALOG(dialog), close_button, GTK_RESPONSE_NO);
-
- gtk_dialog_add_button(GTK_DIALOG(dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
- gtk_dialog_add_action_widget(GTK_DIALOG(dialog), save_button, GTK_RESPONSE_YES);
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES);
-
- gint response;
- response = gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ Gtk::Container *ma = dialog.get_message_area();
+ std::vector<Gtk::Widget*> ma_labels = ma->get_children();
+ ma_labels[0]->set_can_focus(false);
+
+ Gtk::Button close_button(_("Close _without saving"), true);
+ close_button.show();
+ dialog.add_action_widget(close_button, Gtk::RESPONSE_NO);
+
+ dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL);
+
+ Gtk::Button save_button(_("_Save as Inkscape SVG"), true);
+ save_button.set_can_default(true);
+ save_button.show();
+ dialog.add_action_widget(save_button, Gtk::RESPONSE_YES);
+ dialog.set_default_response(Gtk::RESPONSE_YES);
+
+ gint response = dialog.run();
switch (response) {
case GTK_RESPONSE_YES:
@@ -1366,19 +1351,14 @@ SPDesktopWidget::presentWindow()
bool SPDesktopWidget::showInfoDialog( Glib::ustring const &message )
{
bool result = false;
- GtkWindow *window = GTK_WINDOW( gtk_widget_get_toplevel( GTK_WIDGET(this) ) );
+ Gtk::Window *window = Glib::wrap(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(this))));
if (window)
{
- GtkWidget *dialog = gtk_message_dialog_new(
- window,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_OK,
- "%s", message.c_str());
- gtk_widget_set_name(dialog, "InfoDialog");
- gtk_window_set_title( GTK_WINDOW(dialog), _("Note:")); // probably want to take this as a parameter.
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ Gtk::MessageDialog dialog(*window, message, false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK);
+ dialog.property_destroy_with_parent() = true;
+ dialog.set_name("InfoDialog");
+ dialog.set_title(_("Note:")); // probably want to take this as a parameter.
+ dialog.run();
}
return result;
}
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index 318e6ced2..e922bcc00 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -48,6 +48,7 @@
#include <gtkmm/radiomenuitem.h>
#include <gtkmm/adjustment.h>
#include <gdk/gdkkeysyms.h>
+#include <gdkmm/display.h>
#include "widgets/ege-adjustment-action.h"
#include "ui/icon-names.h"
@@ -1014,7 +1015,7 @@ gboolean keypress_cb( GtkWidget *widget, GdkEventKey *event, gpointer data )
gboolean wasConsumed = FALSE; /* default to report event not consumed */
EgeAdjustmentAction* action = EGE_ADJUSTMENT_ACTION(data);
guint key = 0;
- gdk_keymap_translate_keyboard_state( gdk_keymap_get_for_display( gdk_display_get_default() ),
+ gdk_keymap_translate_keyboard_state( Gdk::Display::get_default()->get_keymap(),
event->hardware_keycode, (GdkModifierType)event->state,
0, &key, 0, 0, 0 );
diff --git a/src/widgets/ink-comboboxentry-action.cpp b/src/widgets/ink-comboboxentry-action.cpp
index 2fecb06a4..133ae7878 100644
--- a/src/widgets/ink-comboboxentry-action.cpp
+++ b/src/widgets/ink-comboboxentry-action.cpp
@@ -29,6 +29,7 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#include <gdkmm/display.h>
#include "widgets/ink-comboboxentry-action.h"
#include "ui/icon-names.h"
@@ -921,7 +922,7 @@ gboolean keypress_cb( GtkWidget * /*widget*/, GdkEventKey *event, gpointer data
gboolean wasConsumed = FALSE; /* default to report event not consumed */
guint key = 0;
Ink_ComboBoxEntry_Action* action = INK_COMBOBOXENTRY_ACTION( data );
- gdk_keymap_translate_keyboard_state( gdk_keymap_get_for_display( gdk_display_get_default() ),
+ gdk_keymap_translate_keyboard_state( Gdk::Display::get_default()->get_keymap(),
event->hardware_keycode, (GdkModifierType)event->state,
0, &key, 0, 0, 0 );
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 16:38:58 +0000