AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge of wxMac into main repository

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2000-08-09 11:14:15 +00:00
parent 05adb9d2fd
commit a02bb1438a
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/defs.h
View File

@ -691,7 +691,7 @@ typedef float wxFloat32 ;
= { 0xE158 }; = { 0xE158 };
#pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0) #pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0)
pascal wxInt16 wxUINT16_SWAP_ALWAYS(wxInt16 value) pascal wxInt16 wxINT16_SWAP_ALWAYS(wxInt16 value)
= { 0xE158 }; = { 0xE158 };
#pragma parameter __D0 wxUINT32_SWAP_ALWAYS (__D0) #pragma parameter __D0 wxUINT32_SWAP_ALWAYS (__D0)
@ -699,7 +699,7 @@ typedef float wxFloat32 ;
= { 0xE158, 0x4840, 0xE158 }; = { 0xE158, 0x4840, 0xE158 };
#pragma parameter __D0 wxINT32_SWAP_ALWAYS (__D0) #pragma parameter __D0 wxINT32_SWAP_ALWAYS (__D0)
pascal wxInt32 wxUINT32_SWAP_ALWAYS(wxInt32 value) pascal wxInt32 wxINT32_SWAP_ALWAYS(wxInt32 value)
= { 0xE158, 0x4840, 0xE158 }; = { 0xE158, 0x4840, 0xE158 };
#endif #endif

2
include/wx/gsocket.h
View File

@ -18,7 +18,9 @@
#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
#include <stddef.h> #include <stddef.h>
#ifndef __WXMAC__
#include <sys/types.h> #include <sys/types.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
include/wx/metafile.h
View File

@ -38,6 +38,8 @@
#endif #endif
#elif defined(__WXPM__) #elif defined(__WXPM__)
#include "wx/os2/metafile.h" #include "wx/os2/metafile.h"
#elif defined(__WXMAC__)
#include "wx/mac/metafile.h"
#endif #endif
#endif #endif

4
include/wx/statusbr.h
View File

@ -54,6 +54,10 @@ protected:
#include "wx/msw/statbr95.h" #include "wx/msw/statbr95.h"
typedef wxStatusBar95 wxStatusBarReal; typedef wxStatusBar95 wxStatusBarReal;
#elif defined(__WXMAC__)
#include "wx/mac/statusbr.h"
typedef wxStatusBarMac wxStatusBarReal;
#else #else
#include "wx/generic/statusbr.h" #include "wx/generic/statusbr.h"

12
include/wx/wx_cw_cm.h
View File

@ -11,14 +11,18 @@
#define __WXMAC__ #define __WXMAC__
#if TARGET_CARBON #if TARGET_CARBON
#define USE_PRECOMPILED_MAC_HEADERS 0 /*Set to 0 if you don't want to use precompiled MacHeaders*/ #define USE_PRECOMPILED_MAC_HEADERS 0 /*Set to 0 if you don't want to use precompiled MacHeaders*/
#ifdef __cplusplus #include "MacHeaders.c"
/*
#define USE_PRECOMPILED_MAC_HEADERS 0
#ifdef __cplusplus
#include <MacHeadersPPCX++> #include <MacHeadersPPCX++>
#else #else
#include <MacHeadersPPCX> #include <MacHeadersPPCX>
#endif #endif
#else */
#define USE_PRECOMPILED_MAC_HEADERS 1 /*Set to 0 if you don't want to use precompiled MacHeaders*/ #else
#endif #define USE_PRECOMPILED_MAC_HEADERS 1 /*Set to 0 if you don't want to use precompiled MacHeaders*/
#endif
// automatically includes MacHeaders // automatically includes MacHeaders
#elif (__MWERKS__ >= 0x0900) && __INTEL__ #elif (__MWERKS__ >= 0x0900) && __INTEL__
#define __WXMSW__ #define __WXMSW__