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

compilation fix for !wxUSE_BASE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-08-10 17:26:46 +00:00
parent 194142ed6f
commit 659b3e8b81
2 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/mac/carbon/utils.cpp
View File

@@ -54,6 +54,31 @@
#include <wtime.h> #include <wtime.h>
#endif #endif
// ---------------------------------------------------------------------------
// code used in both base and GUI compilation
// ---------------------------------------------------------------------------
// our OS version is the same in non GUI and GUI cases
static int DoGetOSVersion(int *majorVsn, int *minorVsn)
{
long theSystem ;
// are there x-platform conventions ?
Gestalt(gestaltSystemVersion, &theSystem) ;
if (minorVsn != NULL) {
*minorVsn = (theSystem & 0xFF ) ;
}
if (majorVsn != NULL) {
*majorVsn = (theSystem >> 8 ) ;
}
#ifdef __DARWIN__
return wxMAC_DARWIN;
#else
return wxMAC;
#endif
}
#if wxUSE_BASE #if wxUSE_BASE
#ifndef __DARWIN__ #ifndef __DARWIN__
@@ -197,27 +222,6 @@ void wxBell()
SysBeep(30); SysBeep(30);
} }
// our OS version is the same in non GUI and GUI cases
static int DoGetOSVersion(int *majorVsn, int *minorVsn)
{
long theSystem ;
// are there x-platform conventions ?
Gestalt(gestaltSystemVersion, &theSystem) ;
if (minorVsn != NULL) {
*minorVsn = (theSystem & 0xFF ) ;
}
if (majorVsn != NULL) {
*majorVsn = (theSystem >> 8 ) ;
}
#ifdef __DARWIN__
return wxMAC_DARWIN;
#else
return wxMAC;
#endif
}
wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo() wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
{ {
static wxToolkitInfo info; static wxToolkitInfo info;

46
src/mac/utils.cpp
View File

@@ -54,6 +54,31 @@
#include <wtime.h> #include <wtime.h>
#endif #endif
// ---------------------------------------------------------------------------
// code used in both base and GUI compilation
// ---------------------------------------------------------------------------
// our OS version is the same in non GUI and GUI cases
static int DoGetOSVersion(int *majorVsn, int *minorVsn)
{
long theSystem ;
// are there x-platform conventions ?
Gestalt(gestaltSystemVersion, &theSystem) ;
if (minorVsn != NULL) {
*minorVsn = (theSystem & 0xFF ) ;
}
if (majorVsn != NULL) {
*majorVsn = (theSystem >> 8 ) ;
}
#ifdef __DARWIN__
return wxMAC_DARWIN;
#else
return wxMAC;
#endif
}
#if wxUSE_BASE #if wxUSE_BASE
#ifndef __DARWIN__ #ifndef __DARWIN__
@@ -197,27 +222,6 @@ void wxBell()
SysBeep(30); SysBeep(30);
} }
// our OS version is the same in non GUI and GUI cases
static int DoGetOSVersion(int *majorVsn, int *minorVsn)
{
long theSystem ;
// are there x-platform conventions ?
Gestalt(gestaltSystemVersion, &theSystem) ;
if (minorVsn != NULL) {
*minorVsn = (theSystem & 0xFF ) ;
}
if (majorVsn != NULL) {
*majorVsn = (theSystem >> 8 ) ;
}
#ifdef __DARWIN__
return wxMAC_DARWIN;
#else
return wxMAC;
#endif
}
wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo() wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
{ {
static wxToolkitInfo info; static wxToolkitInfo info;