From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 4 Aug 2003 01:05:50 +0000 (+0000)
Subject: compilation fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/66b6b57c0ee0b5d022b56da45c183a69fa8a6cf5

compilation fixes


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

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 58ee11d265..fd5c1b0d4f 100644
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -970,12 +970,6 @@ pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , Even
 
 wxApp::wxApp()
 {
-  m_topWindow = NULL;
-  wxTheApp = this;
-
-  argc = 0;
-  argv = NULL;
-
   m_printMode = wxPRINT_WINDOWS;
   m_auto3D = TRUE;
 }
diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 58ee11d265..fd5c1b0d4f 100644
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -970,12 +970,6 @@ pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , Even
 
 wxApp::wxApp()
 {
-  m_topWindow = NULL;
-  wxTheApp = this;
-
-  argc = 0;
-  argv = NULL;
-
   m_printMode = wxPRINT_WINDOWS;
   m_auto3D = TRUE;
 }
diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index ac6399deb8..59a905aece 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -60,7 +60,6 @@
 
 #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
 
-extern wxApp *wxTheApp ;
 extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ;
 
 // CS:TODO we still have a problem getting properly at the text events of a control because under Carbon
diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 24ebec8676..4301e54323 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -221,7 +221,7 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
 wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
-    info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion);
+    info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
     info.name = _T("wxBase");
     return info;
 }
@@ -233,7 +233,7 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
-    info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion);
+    info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
     info.shortName = _T("mac");
     info.name = _T("wxMac");
 #ifdef __WXUNIVERSAL__
diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index ac6399deb8..59a905aece 100644
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -60,7 +60,6 @@
 
 #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
 
-extern wxApp *wxTheApp ;
 extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ;
 
 // CS:TODO we still have a problem getting properly at the text events of a control because under Carbon
diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 24ebec8676..4301e54323 100644
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -221,7 +221,7 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
 wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
-    info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion);
+    info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
     info.name = _T("wxBase");
     return info;
 }
@@ -233,7 +233,7 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
-    info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion);
+    info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
     info.shortName = _T("mac");
     info.name = _T("wxMac");
 #ifdef __WXUNIVERSAL__