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

OSX regrouping

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-07-29 19:47:40 +00:00
parent f94a77989a
commit 26eef30437
9 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/appbase.cpp
View File

@@ -63,19 +63,6 @@
#include "wx/fontmap.h" #include "wx/fontmap.h"
#endif // wxUSE_FONTMAP #endif // wxUSE_FONTMAP
#if defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
// For MacTypes.h for Debugger function
#include <CoreFoundation/CFBase.h>
#endif
#if defined(__WXMAC__)
#ifdef __DARWIN__
#include <CoreServices/CoreServices.h>
#else
#include "wx/mac/private.h" // includes mac headers
#endif
#endif // __WXMAC__
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
#if wxUSE_STACKWALKER #if wxUSE_STACKWALKER
#include "wx/stackwalk.h" #include "wx/stackwalk.h"

2
src/common/dircmn.cpp
View File

@@ -62,7 +62,7 @@ bool wxDir::HasFiles(const wxString& spec) const
} }
// we have a (much) faster version for Unix // we have a (much) faster version for Unix
#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__EMX__) || defined(__WINE__) #if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || ( defined(__WXMAC__) && !wxOSX_USE_IPHONE) || defined(__EMX__) || defined(__WINE__)
bool wxDir::HasSubDirs(const wxString& spec) const bool wxDir::HasSubDirs(const wxString& spec) const
{ {

2
src/common/docview.cpp
View File

@@ -364,7 +364,7 @@ bool wxDocument::OnSaveDocument(const wxString& file)
Modify(false); Modify(false);
SetFilename(file); SetFilename(file);
SetDocumentSaved(true); SetDocumentSaved(true);
#ifdef __WXMAC__ #if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
wxFileName fn(file) ; wxFileName fn(file) ;
fn.MacSetDefaultTypeAndCreator() ; fn.MacSetDefaultTypeAndCreator() ;
#endif #endif

2
src/common/fileconf.cpp
View File

@@ -1035,7 +1035,7 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
ResetDirty(); ResetDirty();
#if defined(__WXMAC__) #if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
m_fnLocalFile.MacSetTypeAndCreator('TEXT', 'ttxt'); m_fnLocalFile.MacSetTypeAndCreator('TEXT', 'ttxt');
#endif // __WXMAC__ #endif // __WXMAC__

2
src/common/filefn.cpp
View File

@@ -1657,7 +1657,7 @@ wxString wxGetOSDirectory()
wxChar buf[256]; wxChar buf[256];
GetWindowsDirectory(buf, 256); GetWindowsDirectory(buf, 256);
return wxString(buf); return wxString(buf);
#elif defined(__WXMAC__) && !defined(__WXOSX_IPHONE__) #elif defined(__WXMAC__) && wxOSX_USE_CARBON
return wxMacFindFolder(kOnSystemDisk, 'macs', false); return wxMacFindFolder(kOnSystemDisk, 'macs', false);
#else #else
return wxEmptyString; return wxEmptyString;

4
src/common/filename.cpp
View File

@@ -1068,7 +1068,7 @@ wxString wxFileName::GetTempDir()
// default // default
#if defined(__DOS__) || defined(__OS2__) #if defined(__DOS__) || defined(__OS2__)
dir = _T("."); dir = _T(".");
#elif defined(__WXMAC__) && !defined(__WXOSX_IPHONE__) #elif defined(__WXMAC__) && wxOSX_USE_CARBON
dir = wxMacFindFolder(short(kOnSystemDisk), kTemporaryFolderType, kCreateFolder); dir = wxMacFindFolder(short(kOnSystemDisk), kTemporaryFolderType, kCreateFolder);
#else #else
dir = _T("/tmp"); dir = _T("/tmp");
@@ -2383,7 +2383,7 @@ wxString wxFileName::GetHumanReadableSize(const wxString &failmsg, int precision
// Mac-specific functions // Mac-specific functions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined( __WXMAC__ ) && !defined( __WXOSX_IPHONE__ ) #if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
const short kMacExtensionMaxLength = 16 ; const short kMacExtensionMaxLength = 16 ;
class MacDefaultExtensionRecord class MacDefaultExtensionRecord

2
src/common/iconbndl.cpp
View File

@@ -181,7 +181,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
} }
} }
#ifdef __WXMAC__ #if defined( __WXMAC__ ) && wxOSX_USE_CARRBON
return wxIcon(iconBest.GetHICON(), size); return wxIcon(iconBest.GetHICON(), size);
#else #else
return iconBest; return iconBest;

2
src/common/mimecmn.cpp
View File

@@ -48,7 +48,7 @@
// implementation classes: // implementation classes:
#if defined(__WXMSW__) #if defined(__WXMSW__)
#include "wx/msw/mimetype.h" #include "wx/msw/mimetype.h"
#elif defined(__WXMAC__) #elif ( defined(__WXMAC__) && wxOSX_USE_CARBON )
#include "wx/osx/mimetype.h" #include "wx/osx/mimetype.h"
#elif defined(__WXPM__) || defined (__EMX__) #elif defined(__WXPM__) || defined (__EMX__)
#include "wx/os2/mimetype.h" #include "wx/os2/mimetype.h"

2
src/common/prntbase.cpp
View File

@@ -212,7 +212,7 @@ wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent,
wxDCImpl* wxNativePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) wxDCImpl* wxNativePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data )
{ {
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXUNIVERSAL__) #if defined(__WXGTK__) || defined(__WXMOTIF__) || ( defined(__WXUNIVERSAL__) && !defined(__WXMAC__) )
return new wxPostScriptDCImpl( owner, data ); return new wxPostScriptDCImpl( owner, data );
#else #else
return new wxPrinterDCImpl( owner, data ); return new wxPrinterDCImpl( owner, data );