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

made sure the alignment for the non-carbon fake list def resource is always 68k

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-01-05 16:40:14 +00:00
parent 12cd5f34e7
commit 573ac9dc6e
4 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mac/carbon/checklst.cpp
View File

@@ -36,11 +36,27 @@ const short kwxMacListWithVerticalScrollbar = 128 ;
const short kwxMacListItemHeight = 14 ; const short kwxMacListItemHeight = 14 ;
const short kwxMacListCheckboxWidth = 14 ; const short kwxMacListCheckboxWidth = 14 ;
#if PRAGMA_STRUCT_ALIGN
#pragma options align=mac68k
#elif PRAGMA_STRUCT_PACKPUSH
#pragma pack(push, 2)
#elif PRAGMA_STRUCT_PACK
#pragma pack(2)
#endif
typedef struct { typedef struct {
unsigned short instruction; unsigned short instruction;
void (*function)(); void (*function)();
} ldefRec, *ldefPtr, **ldefHandle; } ldefRec, *ldefPtr, **ldefHandle;
#if PRAGMA_STRUCT_ALIGN
#pragma options align=reset
#elif PRAGMA_STRUCT_PACKPUSH
#pragma pack(pop)
#elif PRAGMA_STRUCT_PACK
#pragma pack()
#endif
extern "C" extern "C"
{ {
static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect, static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect,

15
src/mac/carbon/listbox.cpp
View File

@@ -32,12 +32,27 @@ END_EVENT_TABLE()
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#if PRAGMA_STRUCT_ALIGN
#pragma options align=mac68k
#elif PRAGMA_STRUCT_PACKPUSH
#pragma pack(push, 2)
#elif PRAGMA_STRUCT_PACK
#pragma pack(2)
#endif
typedef struct { typedef struct {
unsigned short instruction; unsigned short instruction;
void (*function)(); void (*function)();
} ldefRec, *ldefPtr, **ldefHandle; } ldefRec, *ldefPtr, **ldefHandle;
#if PRAGMA_STRUCT_ALIGN
#pragma options align=reset
#elif PRAGMA_STRUCT_PACKPUSH
#pragma pack(pop)
#elif PRAGMA_STRUCT_PACK
#pragma pack()
#endif
extern "C" extern "C"
{ {
static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect, static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,

16
src/mac/checklst.cpp
View File

@@ -36,11 +36,27 @@ const short kwxMacListWithVerticalScrollbar = 128 ;
const short kwxMacListItemHeight = 14 ; const short kwxMacListItemHeight = 14 ;
const short kwxMacListCheckboxWidth = 14 ; const short kwxMacListCheckboxWidth = 14 ;
#if PRAGMA_STRUCT_ALIGN
#pragma options align=mac68k
#elif PRAGMA_STRUCT_PACKPUSH
#pragma pack(push, 2)
#elif PRAGMA_STRUCT_PACK
#pragma pack(2)
#endif
typedef struct { typedef struct {
unsigned short instruction; unsigned short instruction;
void (*function)(); void (*function)();
} ldefRec, *ldefPtr, **ldefHandle; } ldefRec, *ldefPtr, **ldefHandle;
#if PRAGMA_STRUCT_ALIGN
#pragma options align=reset
#elif PRAGMA_STRUCT_PACKPUSH
#pragma pack(pop)
#elif PRAGMA_STRUCT_PACK
#pragma pack()
#endif
extern "C" extern "C"
{ {
static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect, static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect,

15
src/mac/listbox.cpp
View File

@@ -32,12 +32,27 @@ END_EVENT_TABLE()
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#if PRAGMA_STRUCT_ALIGN
#pragma options align=mac68k
#elif PRAGMA_STRUCT_PACKPUSH
#pragma pack(push, 2)
#elif PRAGMA_STRUCT_PACK
#pragma pack(2)
#endif
typedef struct { typedef struct {
unsigned short instruction; unsigned short instruction;
void (*function)(); void (*function)();
} ldefRec, *ldefPtr, **ldefHandle; } ldefRec, *ldefPtr, **ldefHandle;
#if PRAGMA_STRUCT_ALIGN
#pragma options align=reset
#elif PRAGMA_STRUCT_PACKPUSH
#pragma pack(pop)
#elif PRAGMA_STRUCT_PACK
#pragma pack()
#endif
extern "C" extern "C"
{ {
static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect, static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,