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

modified configure to allow configuration of wxMotif under Darwin/Mac OS X

Browse Source 
wxWindows can be configured as wxMac or wxMotif under Mac OS X
replaced __WXMAC_X__ define by __DARWIN__ (general Darwin related issues)
moved dlopen/dlerror code to dynlib.cpp to make it available for wxMotif


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-07-15 21:04:44 +00:00
parent 2cc7838931
commit 6e040042ba
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dirdlg.h
View File

@@ -24,7 +24,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
#elif defined(__WXQT__) #elif defined(__WXQT__)
#include "wx/qt/dirdlg.h" #include "wx/qt/dirdlg.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#ifdef __WXMAC_X__ #ifdef __DARWIN__
#include "wx/generic/dirdlgg.h" #include "wx/generic/dirdlgg.h"
#else #else
#include "wx/mac/dirdlg.h" #include "wx/mac/dirdlg.h"

6
include/wx/mac/dnd.h
View File

@@ -25,7 +25,7 @@
class WXDLLEXPORT wxWindow; class WXDLLEXPORT wxWindow;
#ifndef __WXMAC_X__ #ifndef __DARWIN__
class WXDLLEXPORT wxDataObject; class WXDLLEXPORT wxDataObject;
class WXDLLEXPORT wxTextDataObject; class WXDLLEXPORT wxTextDataObject;
class WXDLLEXPORT wxFileDataObject; class WXDLLEXPORT wxFileDataObject;
@@ -37,7 +37,7 @@ class WXDLLEXPORT wxFileDropTarget;
class WXDLLEXPORT wxDropSource; class WXDLLEXPORT wxDropSource;
#ifndef __WXMAC_X__ #ifndef __DARWIN__
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// wxDataObject // wxDataObject
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@@ -168,7 +168,7 @@ class WXDLLEXPORT wxDropTarget: public wxObject
virtual wxDataFormat GetFormat(size_t n) const = 0; virtual wxDataFormat GetFormat(size_t n) const = 0;
}; };
#ifndef __WXMAC_X__ #ifndef __DARWIN__
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// wxTextDropTarget // wxTextDropTarget
//------------------------------------------------------------------------- //-------------------------------------------------------------------------

4
include/wx/mac/uma.h
View File

@@ -21,10 +21,10 @@
#define UMA_USE_8_6 1 #define UMA_USE_8_6 1
#endif #endif
#if defined(__POWERPC__) || defined(__APPLE__) #if defined(__POWERPC__)
#define UMA_USE_APPEARANCE 1 #define UMA_USE_APPEARANCE 1
#define UMA_USE_WINDOWMGR 1 #define UMA_USE_WINDOWMGR 1
#if defined(__APPLE__) #if defined(__DARWIN__)
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#endif #endif
#else #else

6
include/wx/wxchar.h
View File

@@ -266,7 +266,7 @@ typedef _TUCHAR wxUChar;
# if defined(__VISUALC__) && (__VISUALC__ < 900) # if defined(__VISUALC__) && (__VISUALC__ < 900)
# define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5 # define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
# elif defined(__UNIX__) # elif defined(__UNIX__)
# if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__)) # if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || (defined(__DARWIN__))
# define wxUSE_WCHAR_T 1 # define wxUSE_WCHAR_T 1
# else # else
# define wxUSE_WCHAR_T 0 # define wxUSE_WCHAR_T 0
@@ -289,7 +289,7 @@ typedef _TUCHAR wxUChar;
# ifdef HAVE_WCSTR_H # ifdef HAVE_WCSTR_H
# include <wcstr.h> # include <wcstr.h>
# else # else
# if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__)) # if defined(__FreeBSD__) || defined(__DARWIN__)
# include <stdlib.h> # include <stdlib.h>
# define wxNEED_WCSLEN # define wxNEED_WCSLEN
# else # else
@@ -379,7 +379,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
# define wxUChar unsigned char # define wxUChar unsigned char
# endif # endif
# if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__)) # if defined(__FreeBSD__) || defined(__DARWIN__)
# undef _T # undef _T
# endif # endif