From 98ab9f59336a4b5cf4f358418a2e22087e728409 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 31 May 2012 00:12:58 +0100 Subject: Gtkmm 3.0 fixes for debug dialog (bzr r11438) --- src/ui/dialog/debug.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/ui/dialog/debug.cpp') diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index 7095d2611..d6077a436 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -72,6 +72,23 @@ DebugDialogImpl::DebugDialogImpl() Gtk::Box *mainVBox = get_vbox(); //## Add a menu for clear() +#if WITH_GTKMM_3_0 + Gtk::MenuItem* item = Gtk::manage(new Gtk::MenuItem(_("_File"))); + item->set_submenu(fileMenu); + menuBar.append(*item); + + item = Gtk::manage(new Gtk::MenuItem(_("_Clear"))); + item->signal_activate().connect(sigc::mem_fun(*this, &DebugDialogImpl::clear)); + fileMenu.append(*item); + + item = Gtk::manage(new Gtk::MenuItem(_("Capture log messages"))); + item->signal_activate().connect(sigc::mem_fun(*this, &DebugDialogImpl::captureLogMessages)); + fileMenu.append(*item); + + item = Gtk::manage(new Gtk::MenuItem(_("Release log messages"))); + item->signal_activate().connect(sigc::mem_fun(*this, &DebugDialogImpl::releaseLogMessages)); + fileMenu.append(*item); +#else menuBar.items().push_back( Gtk::Menu_Helpers::MenuElem(_("_File"), fileMenu) ); fileMenu.items().push_back( Gtk::Menu_Helpers::MenuElem(_("_Clear"), sigc::mem_fun(*this, &DebugDialogImpl::clear) ) ); @@ -79,6 +96,8 @@ DebugDialogImpl::DebugDialogImpl() sigc::mem_fun(*this, &DebugDialogImpl::captureLogMessages) ) ); fileMenu.items().push_back( Gtk::Menu_Helpers::MenuElem(_("Release log messages"), sigc::mem_fun(*this, &DebugDialogImpl::releaseLogMessages) ) ); +#endif + mainVBox->pack_start(menuBar, Gtk::PACK_SHRINK); -- cgit v1.2.3 From 180528a72e66d1e6eb9a604dac274709a347a094 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 31 May 2012 01:11:59 +0100 Subject: Tidy up deprecated Gtkmm menu stuff (bzr r11440) --- src/ui/dialog/debug.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/ui/dialog/debug.cpp') diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index d6077a436..a026f3501 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -72,12 +72,11 @@ DebugDialogImpl::DebugDialogImpl() Gtk::Box *mainVBox = get_vbox(); //## Add a menu for clear() -#if WITH_GTKMM_3_0 - Gtk::MenuItem* item = Gtk::manage(new Gtk::MenuItem(_("_File"))); + Gtk::MenuItem* item = Gtk::manage(new Gtk::MenuItem(_("_File"), true)); item->set_submenu(fileMenu); menuBar.append(*item); - item = Gtk::manage(new Gtk::MenuItem(_("_Clear"))); + item = Gtk::manage(new Gtk::MenuItem(_("_Clear"), true)); item->signal_activate().connect(sigc::mem_fun(*this, &DebugDialogImpl::clear)); fileMenu.append(*item); @@ -88,15 +87,6 @@ DebugDialogImpl::DebugDialogImpl() item = Gtk::manage(new Gtk::MenuItem(_("Release log messages"))); item->signal_activate().connect(sigc::mem_fun(*this, &DebugDialogImpl::releaseLogMessages)); fileMenu.append(*item); -#else - menuBar.items().push_back( Gtk::Menu_Helpers::MenuElem(_("_File"), fileMenu) ); - fileMenu.items().push_back( Gtk::Menu_Helpers::MenuElem(_("_Clear"), - sigc::mem_fun(*this, &DebugDialogImpl::clear) ) ); - fileMenu.items().push_back( Gtk::Menu_Helpers::MenuElem(_("Capture log messages"), - sigc::mem_fun(*this, &DebugDialogImpl::captureLogMessages) ) ); - fileMenu.items().push_back( Gtk::Menu_Helpers::MenuElem(_("Release log messages"), - sigc::mem_fun(*this, &DebugDialogImpl::releaseLogMessages) ) ); -#endif mainVBox->pack_start(menuBar, Gtk::PACK_SHRINK); -- cgit v1.2.3 From aca1914d674a5e81234208248e3c8515a60dd19d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 Oct 2012 12:30:12 +1000 Subject: code cleanup: make more functions static, add includes. (bzr r11737) --- src/ui/dialog/debug.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ui/dialog/debug.cpp') diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index a026f3501..da38e2dde 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -171,10 +171,10 @@ void DebugDialog::showInstance() /*##### THIS IS THE IMPORTANT PART ##### */ -void dialogLoggingFunction(const gchar */*log_domain*/, - GLogLevelFlags /*log_level*/, - const gchar *messageText, - gpointer user_data) +static void dialogLoggingFunction(const gchar */*log_domain*/, + GLogLevelFlags /*log_level*/, + const gchar *messageText, + gpointer user_data) { DebugDialogImpl *dlg = static_cast(user_data); dlg->message(messageText); -- cgit v1.2.3 From 8ee9827502fadcae0b02fec434799e94ee115357 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 25 Dec 2012 22:50:08 +0000 Subject: Convert a load more C-style pointer casts to GObject or C++ casts (merry christmas\!) (bzr r11986) --- src/ui/dialog/debug.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/debug.cpp') diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index da38e2dde..429ed57bf 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -126,7 +126,7 @@ void DebugDialogImpl::show() { //call super() Gtk::Dialog::show(); - //sp_transientize((GtkWidget *)gobj()); //Make transient + //sp_transientize(GTK_WIDGET(gobj())); //Make transient raise(); Gtk::Dialog::present(); } -- cgit v1.2.3 From 1d3f07d09370bf8fefa7968706375ae3669dbd1c Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 8 Mar 2013 01:44:43 +0000 Subject: Drop deprecated get_vbox method in Gtk::Dialog (bzr r12181) --- src/ui/dialog/debug.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/ui/dialog/debug.cpp') diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index 429ed57bf..e61f8e389 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -69,7 +69,11 @@ DebugDialogImpl::DebugDialogImpl() set_title(_("Messages")); set_size_request(300, 400); +#if WITH_GTKMM_3_0 + Gtk::Box *mainVBox = get_content_area(); +#else Gtk::Box *mainVBox = get_vbox(); +#endif //## Add a menu for clear() Gtk::MenuItem* item = Gtk::manage(new Gtk::MenuItem(_("_File"), true)); -- cgit v1.2.3 From 0cdd007ebf8dcfbd39c1d36ab53f43617eb692df Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 25 Mar 2013 17:42:31 +0000 Subject: Workaround usage of deprecated glib symbols in 3rd party libraries Fixed bugs: - https://launchpad.net/bugs/1122774 (bzr r12243) --- src/ui/dialog/debug.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/debug.cpp') diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index e61f8e389..d127261c0 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -13,13 +13,13 @@ # include #endif -#include #include #include #include #include #include #include +#include #include "debug.h" -- cgit v1.2.3 From 3c82e8251460b21c8046a418a9fefb700db0a164 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Tue, 4 Jun 2013 01:52:40 -0700 Subject: Correct to compile against recent gtkmm, including updated macports versions. Fixes bug #1179338. Fixed bugs: - https://launchpad.net/bugs/1179338 (bzr r12346.1.1) --- src/ui/dialog/debug.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/ui/dialog/debug.cpp') diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index d127261c0..20865bce6 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -13,6 +13,8 @@ # include #endif +#include + #include #include #include -- cgit v1.2.3 From 72d8e897c6b67e46b2a613c4743ef9c13de25059 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Thu, 6 Jun 2013 06:44:11 -0700 Subject: Added configure/ifdef guards to only bring in the needed #include if glibmm has it. (bzr r12353) --- src/ui/dialog/debug.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/ui/dialog/debug.cpp') diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index 20865bce6..9e2287f80 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -13,7 +13,9 @@ # include #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include +#endif #include #include -- cgit v1.2.3