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 58ee11d265470c94254c42014ddf0bae5c68a0e2..fd5c1b0d4f27084b82632c002cd13d8efb791a49 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -970,12 +970,6 @@ pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , Even
 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-  m_topWindow = NULL;
-  wxTheApp = this;
-
-  argc = 0;
-  argv = NULL;
-

   m_printMode = wxPRINT_WINDOWS;
   m_auto3D = TRUE;
 }
   m_printMode = wxPRINT_WINDOWS;
   m_auto3D = TRUE;
 }

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 58ee11d265470c94254c42014ddf0bae5c68a0e2..fd5c1b0d4f27084b82632c002cd13d8efb791a49 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -970,12 +970,6 @@ pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , Even
 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-  m_topWindow = NULL;
-  wxTheApp = this;
-
-  argc = 0;
-  argv = NULL;
-

   m_printMode = wxPRINT_WINDOWS;
   m_auto3D = TRUE;
 }
   m_printMode = wxPRINT_WINDOWS;
   m_auto3D = TRUE;
 }

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index ac6399deb895b4c76a5cd334af60f9c013d914a5..59a905aeceacbf373f2db12197ae4dd2697cb905 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -60,7 +60,6 @@
 
 #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
 
 
 #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
 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 24ebec8676a9f32dd3f9f6e9d66a2a238722a873..4301e543230deb1f4f2cf4d1ea1c04bb7cc129c8 100644 (file)
--- 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;
 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;
 }
     info.name = _T("wxBase");
     return info;
 }


@@ -233,7 +233,7 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
 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__
     info.shortName = _T("mac");
     info.name = _T("wxMac");
 #ifdef __WXUNIVERSAL__

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index ac6399deb895b4c76a5cd334af60f9c013d914a5..59a905aeceacbf373f2db12197ae4dd2697cb905 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -60,7 +60,6 @@
 
 #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
 
 
 #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
 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 24ebec8676a9f32dd3f9f6e9d66a2a238722a873..4301e543230deb1f4f2cf4d1ea1c04bb7cc129c8 100644 (file)
--- 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;
 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;
 }
     info.name = _T("wxBase");
     return info;
 }


@@ -233,7 +233,7 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
 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__
     info.shortName = _T("mac");
     info.name = _T("wxMac");
 #ifdef __WXUNIVERSAL__