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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 84cad9fe34e3e0e5c4d0b0e306cbcb572ca26123..4f8bc5723bc94eb92fb28afbd4ab1de907560f89 100644 (file)
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -36,11 +36,27 @@ const short kwxMacListWithVerticalScrollbar = 128 ;
 const short kwxMacListItemHeight = 14 ;
 const short kwxMacListCheckboxWidth = 14 ;
 
 const short kwxMacListItemHeight = 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 {
  unsigned short instruction;
  void (*function)();
 } ldefRec, *ldefPtr, **ldefHandle;
 
 typedef struct {
  unsigned short instruction;
  void (*function)();
 } 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"
 {
 static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect,
 extern "C"
 {
 static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect,

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 3e5ae1bc372273992a28234a6f80fbe06bfe3fb7..91595e5f38c5dd2899fef6ea82a0787a7eabc18a 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -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 {
  unsigned short instruction;
  void (*function)();
 } ldefRec, *ldefPtr, **ldefHandle;
 
 
 typedef struct {
  unsigned short instruction;
  void (*function)();
 } 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"
 {
 static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
 extern "C"
 {
 static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,

diff --git a/src/mac/checklst.cpp b/src/mac/checklst.cpp
index 84cad9fe34e3e0e5c4d0b0e306cbcb572ca26123..4f8bc5723bc94eb92fb28afbd4ab1de907560f89 100644 (file)
--- a/src/mac/checklst.cpp
+++ b/src/mac/checklst.cpp
@@ -36,11 +36,27 @@ const short kwxMacListWithVerticalScrollbar = 128 ;
 const short kwxMacListItemHeight = 14 ;
 const short kwxMacListCheckboxWidth = 14 ;
 
 const short kwxMacListItemHeight = 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 {
  unsigned short instruction;
  void (*function)();
 } ldefRec, *ldefPtr, **ldefHandle;
 
 typedef struct {
  unsigned short instruction;
  void (*function)();
 } 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"
 {
 static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect,
 extern "C"
 {
 static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect,

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index 3e5ae1bc372273992a28234a6f80fbe06bfe3fb7..91595e5f38c5dd2899fef6ea82a0787a7eabc18a 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -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 {
  unsigned short instruction;
  void (*function)();
 } ldefRec, *ldefPtr, **ldefHandle;
 
 
 typedef struct {
  unsigned short instruction;
  void (*function)();
 } 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"
 {
 static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
 extern "C"
 {
 static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,