projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct some compile warnings and errors
[wxWidgets.git]
/
src
/
unix
/
baseunix.cpp
diff --git
a/src/unix/baseunix.cpp
b/src/unix/baseunix.cpp
index b265339a06d00621b0ceea033b37d4e9b15fd36c..bd40653d6fcbabe041e58e39ce64578d59c71f33 100644
(file)
--- a/
src/unix/baseunix.cpp
+++ b/
src/unix/baseunix.cpp
@@
-88,8
+88,9
@@
wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
// this is in mac/utils.cpp under Mac
#ifndef __WXMAC__
// this is in mac/utils.cpp under Mac
#ifndef __WXMAC__
-
int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin
)
+
wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo(
)
{
{
+ static wxToolkitInfo info;
int major, minor;
char name[256];
int major, minor;
char name[256];
@@
-100,12
+101,12
@@
int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
minor = -1;
}
minor = -1;
}
- i
f ( verMaj )
-
*verMaj = maj
or;
- i
f ( verMin )
-
*verMin = minor
;
+ i
nfo.versionMajor = major;
+
info.versionMinor = min
or;
+ i
nfo.name = _T("wxBase");
+
info.os = wxUNIX
;
- return
wxUNIX
;
+ return
info
;
}
#endif // __WXMAC__
}
#endif // __WXMAC__