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

compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-08-04 01:05:50 +00:00
parent 199fbd7093
commit 66b6b57c0e
6 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mac/app.cpp
View File

@@ -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_printMode = wxPRINT_WINDOWS;
m_auto3D = TRUE; m_auto3D = TRUE;
} }

6
src/mac/carbon/app.cpp
View File

@@ -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_printMode = wxPRINT_WINDOWS;
m_auto3D = TRUE; m_auto3D = TRUE;
} }

1
src/mac/carbon/textctrl.cpp
View File

@@ -60,7 +60,6 @@
#define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
extern wxApp *wxTheApp ;
extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ; extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ;
// CS:TODO we still have a problem getting properly at the text events of a control because under Carbon // CS:TODO we still have a problem getting properly at the text events of a control because under Carbon

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

@@ -221,7 +221,7 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo() wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
{ {
static wxToolkitInfo info; static wxToolkitInfo info;
info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion); info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
info.name = _T("wxBase"); info.name = _T("wxBase");
return info; return info;
} }
@@ -233,7 +233,7 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
{ {
static wxToolkitInfo info; static wxToolkitInfo info;
info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion); info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
info.shortName = _T("mac"); info.shortName = _T("mac");
info.name = _T("wxMac"); info.name = _T("wxMac");
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__

1
src/mac/textctrl.cpp
View File

@@ -60,7 +60,6 @@
#define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL #define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
extern wxApp *wxTheApp ;
extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ; extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ;
// CS:TODO we still have a problem getting properly at the text events of a control because under Carbon // CS:TODO we still have a problem getting properly at the text events of a control because under Carbon

4
src/mac/utils.cpp
View File

@@ -221,7 +221,7 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo() wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
{ {
static wxToolkitInfo info; static wxToolkitInfo info;
info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion); info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
info.name = _T("wxBase"); info.name = _T("wxBase");
return info; return info;
} }
@@ -233,7 +233,7 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
{ {
static wxToolkitInfo info; static wxToolkitInfo info;
info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion); info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
info.shortName = _T("mac"); info.shortName = _T("mac");
info.name = _T("wxMac"); info.name = _T("wxMac");
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__