modified configure to allow configuration of wxMotif under Darwin/Mac OS X
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@11064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -418,7 +418,7 @@ wxLogStderr::wxLogStderr(FILE *fp)
|
||||
m_fp = fp;
|
||||
}
|
||||
|
||||
#if defined(__WXMAC__) && !defined(__UNIX__)
|
||||
#if defined(__WXMAC__) && !defined(__DARWIN__)
|
||||
#define kDebuggerSignature 'MWDB'
|
||||
|
||||
static Boolean FindProcessBySignature(OSType signature, ProcessInfoRec* info)
|
||||
@@ -514,7 +514,7 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
|
||||
str += wxT("\r\n") ;
|
||||
OutputDebugString(str.c_str());
|
||||
#endif // MSW
|
||||
#if defined(__WXMAC__) && !defined(__WXMAC_X__) && wxUSE_GUI
|
||||
#if defined(__WXMAC__) && !defined(__DARWIN__) && wxUSE_GUI
|
||||
Str255 pstr ;
|
||||
strcpy( (char*) pstr , str.c_str() ) ;
|
||||
strcat( (char*) pstr , ";g" ) ;
|
||||
|
@@ -42,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
|
||||
#ifdef ENABLE_IPV6
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
|
||||
#endif
|
||||
#if defined(__UNIX__) && !defined(__WXMAC_X__)
|
||||
#if defined(__UNIX__) && !defined(__WXMAC__)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
|
||||
#endif
|
||||
|
||||
@@ -201,7 +201,7 @@ unsigned short wxIPV6address::Service()
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(__UNIX__) && !defined(__WXMAC_X__)
|
||||
#if defined(__UNIX__) && !defined(__WXMAC__)
|
||||
// ---------------------------------------------------------------------------
|
||||
// wxUNIXaddress
|
||||
// ---------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user