X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbfc5b97635239f37f7d85fb9e56e98eb6bef05a..7ac13b21fe95a726626ea554e9ba5a6d12bf3ce1:/src/mac/checklst.cpp

diff --git a/src/mac/checklst.cpp b/src/mac/checklst.cpp
index 7d8bec19e8..4f8bc5723b 100644
--- 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 ;
 
+#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;
 
+#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,
@@ -52,7 +68,6 @@ static pascal void wxMacCheckListDefinition( short message, Boolean isSelected,
                                      Cell cell, short dataOffset, short dataLength,
                                      ListHandle listHandle )
 {
-    FontInfo fontInfo;
     GrafPtr savePort;
     GrafPtr grafPtr;
     RgnHandle savedClipRegion;
@@ -109,10 +124,10 @@ static pascal void wxMacCheckListDefinition( short message, Boolean isSelected,
             //  appropriate QuickDraw transform mode.
             
             if( isSelected ) {
-                savedPenMode = GetPortPenMode( grafPtr );
-                SetPortPenMode( grafPtr, hilitetransfermode );
+                savedPenMode = GetPortPenMode( (CGrafPtr) grafPtr );
+                SetPortPenMode( (CGrafPtr) grafPtr, hilitetransfermode );
                 PaintRect( drawRect );
-                SetPortPenMode( grafPtr, savedPenMode );
+                SetPortPenMode( (CGrafPtr) grafPtr, savedPenMode );
             }
             
             //  Restore the saved clip region.
@@ -127,10 +142,10 @@ static pascal void wxMacCheckListDefinition( short message, Boolean isSelected,
             //  appropriate QuickDraw transform mode.
             
             GetPort( &grafPtr );
-            savedPenMode = GetPortPenMode( grafPtr );
-            SetPortPenMode( grafPtr, hilitetransfermode );
+            savedPenMode = GetPortPenMode( (CGrafPtr) grafPtr );
+            SetPortPenMode( (CGrafPtr) grafPtr, hilitetransfermode );
             PaintRect( drawRect );
-            SetPortPenMode( grafPtr, savedPenMode );
+            SetPortPenMode( (CGrafPtr) grafPtr, savedPenMode );
             break;
         default :
           break ;
@@ -180,39 +195,39 @@ bool wxCheckListBox::Create(wxWindow *parent,
     Size asize;
 
 
-    CreateListBoxControl( parent->MacGetRootWindow(), &bounds, false, 0, 1, false, true,
-                          14, 14, false, &listDef, &m_macControl );
+    CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true,
+                          14, 14, false, &listDef, (ControlRef *)&m_macControl );
 
-    GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
+    GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag,
                    sizeof(ListHandle), (Ptr) &m_macList, &asize);
 
-    SetControlReference(m_macControl, (long) this);
-    SetControlVisibility(m_macControl, false, false);
+    SetControlReference( (ControlHandle) m_macControl, (long) this);
+    SetControlVisibility( (ControlHandle) m_macControl, false, false);
 
 #else
 
     long    result ;
 
-    m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false ,
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
                   kwxMacListWithVerticalScrollbar , 0 , 0, 
                   kControlListBoxProc , (long) this ) ;
-    ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
+    ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
                sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
 
     HLock( (Handle) m_macList ) ;
     ldefHandle ldef ;
     ldef = (ldefHandle) NewHandle( sizeof(ldefRec) ) ;
-    if (  (**m_macList).listDefProc != NULL )
+    if (  (**(ListHandle)m_macList).listDefProc != NULL )
     {
       (**ldef).instruction = 0x4EF9;  /* JMP instruction */
       (**ldef).function = (void(*)()) listDef.u.userProc;
-      (**m_macList).listDefProc = (Handle) ldef ;
+      (**(ListHandle)m_macList).listDefProc = (Handle) ldef ;
     }
         
-    Point pt = (**m_macList).cellSize ;
+    Point pt = (**(ListHandle)m_macList).cellSize ;
     pt.v = 14 ;
-    LCellSize( pt , m_macList ) ;
-    LAddColumn( 1 , 0 , m_macList ) ;
+    LCellSize( pt , (ListHandle)m_macList ) ;
+    LAddColumn( 1 , 0 , (ListHandle)m_macList ) ;
 #endif
     OptionBits  options = 0;
     if ( style & wxLB_MULTIPLE )
@@ -227,7 +242,7 @@ bool wxCheckListBox::Create(wxWindow *parent,
     {
         options = lOnlyOne ;
     }
-    SetListSelectionFlags(m_macList, options);
+    SetListSelectionFlags((ListHandle)m_macList, options);
     
     MacPostControlCreate() ;
     
@@ -236,7 +251,7 @@ bool wxCheckListBox::Create(wxWindow *parent,
         Append( choices[i] ) ;
     }
     
-    LSetDrawingMode( true , m_macList ) ;
+    LSetDrawingMode( true , (ListHandle) m_macList ) ;
 
     return TRUE;
 }
@@ -352,14 +367,14 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
     int topcell ;
 #if TARGET_CARBON
     Point pt ;
-    GetListCellSize( m_macList , &pt ) ;
+    GetListCellSize( (ListHandle)m_macList , &pt ) ;
     lineheight = pt.v ;
     ListBounds visible ;
-    GetListVisibleCells( m_macList , &visible ) ;
+    GetListVisibleCells( (ListHandle)m_macList , &visible ) ;
     topcell = visible.top ;
 #else
-    lineheight =  (**m_macList).cellSize.v ;
-    topcell = (**m_macList).visible.top ;
+    lineheight =  (**(ListHandle)m_macList).cellSize.v ;
+    topcell = (**(ListHandle)m_macList).visible.top ;
 #endif
     size_t nItem = ((size_t)event.GetY()) / lineheight + topcell ;