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

fixed build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-10 00:27:26 +00:00
parent 7579971933
commit 29c99ad359
4 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/apptrait.h
View File

@@ -90,12 +90,14 @@ public:
// include the platform-specific version of the class
// ----------------------------------------------------------------------------
// NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the
// Unix code (and otherwise __UNIX__ wouldn't be defined)
#if defined(__WXMSW__)
#include "wx/msw/apptbase.h"
#elif defined(__WXMAC__)
#include "wx/mac/apptbase.h"
#elif defined(__UNIX__)
#include "wx/unix/apptbase.h"
#elif defined(__WXMAC__)
#include "wx/mac/apptbase.h"
#else // no platform-specific methods to add to wxAppTraits
// wxAppTraits must be a class because it was forward declared as class
class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
@@ -165,10 +167,10 @@ public:
#if defined(__WXMSW__)
#include "wx/msw/apptrait.h"
#elif defined(__WXMAC__)
#include "wx/mac/apptrait.h"
#elif defined(__UNIX__)
#include "wx/unix/apptrait.h"
#elif defined(__WXMAC__)
#include "wx/mac/apptrait.h"
#else // no platform-specific methods to add to wxAppTraits
#if wxUSE_GUI
typedef wxGUIAppTraitsBase wxGUIAppTraits;

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

@@ -197,7 +197,8 @@ void wxBell()
SysBeep(30);
}
int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
// our OS version is the same in non GUI and GUI cases
static int DoGetOSVersion(int *majorVsn, int *minorVsn)
{
long theSystem ;
@@ -217,10 +218,20 @@ int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
#endif
}
int wxConsoleAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
{
return DoGetOSVersion(majorVsn, minorVsn);
}
#endif // wxUSE_BASE
#if wxUSE_GUI
int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
{
return DoGetOSVersion(majorVsn, minorVsn);
}
// Reading and writing resources (eg WIN.INI, .Xdefaults)
#if wxUSE_RESOURCES
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)

13
src/mac/utils.cpp
View File

@@ -197,7 +197,8 @@ void wxBell()
SysBeep(30);
}
int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
// our OS version is the same in non GUI and GUI cases
static int DoGetOSVersion(int *majorVsn, int *minorVsn)
{
long theSystem ;
@@ -217,10 +218,20 @@ int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
#endif
}
int wxConsoleAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
{
return DoGetOSVersion(majorVsn, minorVsn);
}
#endif // wxUSE_BASE
#if wxUSE_GUI
int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
{
return DoGetOSVersion(majorVsn, minorVsn);
}
// Reading and writing resources (eg WIN.INI, .Xdefaults)
#if wxUSE_RESOURCES
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)

8
src/unix/baseunix.cpp
View File

@@ -85,10 +85,8 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
// misc other stuff
// ----------------------------------------------------------------------------
// WXWIN_OS_DESCRIPTION is normally defined by configure
#if defined( __MWERKS__ ) && defined(__MACH__)
#define WXWIN_OS_DESCRIPTION "MacOS X"
#endif
// this is in mac/utils.cpp under Mac
#ifndef __WXMAC__
int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
{
@@ -110,3 +108,5 @@ int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
return wxUNIX;
}
#endif // __WXMAC__