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

app traits support and CW Debug output fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-07-04 19:57:03 +00:00
parent a3b83a5137
commit 536732e482
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,7 +193,11 @@ void wxBell()
SysBeep(30); SysBeep(30);
} }
#if defined(__WXMAC__) && !defined(__DARWIN__)
int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
#else
int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn) int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
#endif
{ {
long theSystem ; long theSystem ;
@@ -213,6 +217,7 @@ int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
#endif #endif
} }
// Reading and writing resources (eg WIN.INI, .Xdefaults) // Reading and writing resources (eg WIN.INI, .Xdefaults)
#if wxUSE_RESOURCES #if wxUSE_RESOURCES
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file) bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
@@ -861,8 +866,7 @@ void wxMacStringToPascal( const wxChar * from , StringPtr to , bool pc2macEncodi
#include <CodeFragments.h> #include <CodeFragments.h>
EXTERN_API_C( long ) extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
ProcPtr gCallUniversalProc_Proc = NULL; ProcPtr gCallUniversalProc_Proc = NULL;

8
src/mac/utils.cpp
View File

@@ -193,7 +193,11 @@ void wxBell()
SysBeep(30); SysBeep(30);
} }
#if defined(__WXMAC__) && !defined(__DARWIN__)
int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
#else
int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn) int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
#endif
{ {
long theSystem ; long theSystem ;
@@ -213,6 +217,7 @@ int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
#endif #endif
} }
// Reading and writing resources (eg WIN.INI, .Xdefaults) // Reading and writing resources (eg WIN.INI, .Xdefaults)
#if wxUSE_RESOURCES #if wxUSE_RESOURCES
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file) bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
@@ -861,8 +866,7 @@ void wxMacStringToPascal( const wxChar * from , StringPtr to , bool pc2macEncodi
#include <CodeFragments.h> #include <CodeFragments.h>
EXTERN_API_C( long ) extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
ProcPtr gCallUniversalProc_Proc = NULL; ProcPtr gCallUniversalProc_Proc = NULL;