>> What is the Gtk3 equivalent of
>> Gtk2->GET_VERSION_INFO
>> and
>> Gtk2->get_version_info
>> ?
> It looks like these convenience functions never made it from Gtk2.pm
> to Gtk3.pm. You can instead use Gtk3::get_major_version (),
> Gtk3::get_micro_version () and Gtk3::get_minor_version () as well as
> Gtk3::MAJOR_VERSION and friends. I'd also gladly accept a patch adding
> ports of the old helpers to Gtk3.pm.
Please find attached a patch to do add the above functionality, along
with some tests.
Regards
Jeff
From a0842203f949dd51d23d0af6148cfe525c86317e Mon Sep 17 00:00:00 2001
From: Jeffrey Ratcliffe <jeffrey.ratcli...@gmail.com>
Date: Wed, 2 May 2018 17:45:19 +0200
Subject: [PATCH] + helper functions Gtk3->get_version_info,
Gtk3->GET_VERSION_INFO
---
lib/Gtk3.pm | 9 +++++++++
t/00-init.t | 31 +++++++++++++++++++++++++------
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/lib/Gtk3.pm b/lib/Gtk3.pm
index 241632d..f328d37 100644
--- a/lib/Gtk3.pm
+++ b/lib/Gtk3.pm
@@ -2381,6 +2381,15 @@ sub ge {
package Gtk3;
+sub get_version_info {
+ return Gtk3::get_major_version(), Gtk3::get_minor_version(),
+ Gtk3::get_micro_version();
+}
+
+sub GET_VERSION_INFO {
+ return Gtk3->MAJOR_VERSION, Gtk3->MINOR_VERSION, Gtk3->MICRO_VERSION;
+}
+
1;
__END__
diff --git a/t/00-init.t b/t/00-init.t
index 34f5cf1..0bc1794 100644
--- a/t/00-init.t
+++ b/t/00-init.t
@@ -17,12 +17,7 @@ unless (eval { Gtk3->import; 1 }) {
}
}
-plan tests => 3;
-
-diag (sprintf 'Testing against gtk+ %d.%d.%d',
- Gtk3::get_major_version (),
- Gtk3::get_minor_version (),
- Gtk3::get_micro_version ());
+plan tests => 16;
SKIP: {
@ARGV = qw(--help --name gtk2perl --urgs tree);
@@ -42,3 +37,27 @@ SKIP: {
eval { my $b = Gtk3::LinkButton->new; };
like ($@, qr/00-init\.t/);
}
+
+my @run_version = Gtk3->get_version_info;
+my @compile_version = Gtk3->GET_VERSION_INFO;
+
+diag 'Testing Gtk3 ', $Gtk3::VERSION;
+diag ' Running against gtk+ ', join '.', @run_version;
+diag ' Compiled against gtk+ ', join '.', @compile_version;
+
+is( @run_version, 3, 'version info is three items long' );
+is (Gtk3->check_version(0,0,0), 'GTK+ version too new (major mismatch)',
+ 'check_version fail 1');
+is (Gtk3->check_version(3,0,0), undef, 'check_version pass');
+is (Gtk3->check_version(50,0,0), 'GTK+ version too old (major mismatch)',
+ 'check_version fail 2');
+ok (defined (Gtk3::get_major_version()), 'major_version');
+ok (defined (Gtk3::get_minor_version()), 'minor_version');
+ok (defined (Gtk3::get_micro_version()), 'micro_version');
+
+is (@compile_version, 3, 'version info is three items long');
+ok (Gtk3->CHECK_VERSION(3,0,0), 'CHECK_VERSION pass');
+ok (!Gtk3->CHECK_VERSION(50,0,0), 'CHECK_VERSION fail');
+is (Gtk3->MAJOR_VERSION, $compile_version[0], 'MAJOR_VERSION');
+is (Gtk3->MINOR_VERSION, $compile_version[1], 'MINOR_VERSION');
+is (Gtk3->MICRO_VERSION, $compile_version[2], 'MICRO_VERSION');
--
2.17.0
_______________________________________________
gtk-perl-list mailing list
gtk-perl-list@gnome.org
https://mail.gnome.org/mailman/listinfo/gtk-perl-list
