compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -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
|
||||
|
@@ -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__
|
||||
|
@@ -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
|
||||
|
@@ -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__
|
||||
|
Reference in New Issue
Block a user