From 659b3e8b818ded7f2b2bcca0143093b8cd42b0a2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 10 Aug 2003 17:26:46 +0000
Subject: [PATCH] compilation fix for !wxUSE_BASE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/mac/carbon/utils.cpp | 46 ++++++++++++++++++++++------------------
src/mac/utils.cpp | 46 ++++++++++++++++++++++------------------
2 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 4301e54323..a3d49a8ae3 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -54,6 +54,31 @@
#include <wtime.h>
#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
#ifndef __DARWIN__
@@ -197,27 +222,6 @@ void wxBell()
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()
{
static wxToolkitInfo info;
diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 4301e54323..a3d49a8ae3 100644
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -54,6 +54,31 @@
#include <wtime.h>
#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
#ifndef __DARWIN__
@@ -197,27 +222,6 @@ void wxBell()
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()
{
static wxToolkitInfo info;
--
2.47.2