Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small bug fixes for GetLibraryVersionInfo() changes.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-11-26 13:31:07 +00:00
parent d3ffaafb37
commit 9c1f960fac
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/stc/stc.h
View File

@@ -38,6 +38,7 @@
#include "wx/control.h" #include "wx/control.h"
#include "wx/dnd.h" #include "wx/dnd.h"
#include "wx/stopwatch.h" #include "wx/stopwatch.h"
#include "wx/versioninfo.h"
#include "wx/textentry.h" #include "wx/textentry.h"
#if wxUSE_TEXTCTRL #if wxUSE_TEXTCTRL

2
src/common/imagtiff.cpp
View File

@@ -635,7 +635,7 @@ bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
micro; micro;
const wxString ver(::TIFFGetVersion()); 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); wxLogDebug("Unrecognized libtiff version string \"%s\"", ver);

2
src/stc/stc.cpp
View File

@@ -4620,7 +4620,7 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
/*static*/ wxVersionInfo wxStyledTextCtrl::GetLibraryVersionInfo() /*static*/ wxVersionInfo wxStyledTextCtrl::GetLibraryVersionInfo()
{ {
return wxVersionInfo("Scintilla", 2, 3); return wxVersionInfo("Scintilla", 2, 3, 0, "Scintilla 2.03");
} }
#endif // wxUSE_STC #endif // wxUSE_STC

2
src/stc/stc.cpp.in
View File

@@ -1120,7 +1120,7 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
/*static*/ wxVersionInfo wxStyledTextCtrl::GetLibraryVersionInfo() /*static*/ wxVersionInfo wxStyledTextCtrl::GetLibraryVersionInfo()
{ {
return wxVersionInfo("Scintilla", 2, 3); return wxVersionInfo("Scintilla", 2, 3, 0, "Scintilla 2.03");
} }
#endif // wxUSE_STC #endif // wxUSE_STC