Small bug fixes for GetLibraryVersionInfo() changes.

Fix the minor version determination for libtiff which was done wrongly by
r66259 and provide a properly formatted description for Scintilla version.

See #12690.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index fbd65e7badaf41de414db16eb1250bbdea500f77..7e314a10f90b2f3f5b536d9f78f671027fd9894f 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -38,6 +38,7 @@
 #include "wx/control.h"
 #include "wx/dnd.h"
 #include "wx/stopwatch.h"
+#include "wx/versioninfo.h"
 
 #include "wx/textentry.h"
 #if wxUSE_TEXTCTRL

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 5a5c6cb5f991c9e9d0dbb1f50ac671a9bc014022..5d8476daec91218bb557fb0a0082462a5af75270 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -635,7 +635,7 @@ bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
         micro;
 
     const wxString ver(::TIFFGetVersion());
-    if ( wxSscanf(ver, "LIBTIFF, Version %d.%d.%d", &major, &micro, &micro) != 3 )
+    if ( wxSscanf(ver, "LIBTIFF, Version %d.%d.%d", &major, &minor, &micro) != 3 )
     {
         wxLogDebug("Unrecognized libtiff version string \"%s\"", ver);
 

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 0e8c6206acd55974a6082fba8c41b9b2033edb41..b0a98e41eecbd572531fec00e00e8880a551f7e6 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -4620,7 +4620,7 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
 
 /*static*/ wxVersionInfo wxStyledTextCtrl::GetLibraryVersionInfo()
 {
-    return wxVersionInfo("Scintilla", 2, 3);
+    return wxVersionInfo("Scintilla", 2, 3, 0, "Scintilla 2.03");
 }
 
 #endif // wxUSE_STC

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index f5c8d79620374b8f4405419d7e41f76373a0fd6b..2dfa4ec02a43727ee3b8d0e213efb330724536ab 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -1120,7 +1120,7 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
 
 /*static*/ wxVersionInfo wxStyledTextCtrl::GetLibraryVersionInfo()
 {
-    return wxVersionInfo("Scintilla", 2, 3);
+    return wxVersionInfo("Scintilla", 2, 3, 0, "Scintilla 2.03");
 }
 
 #endif // wxUSE_STC