X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbfc5b97635239f37f7d85fb9e56e98eb6bef05a..0e7fa78358f89bdfd0f4b78099543b4beb2faaf6:/src/mac/carbon/checklst.cpp?ds=sidebyside diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp index 7d8bec19e8..bba473b606 100644 --- 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 ; +#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; @@ -87,32 +102,40 @@ static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, ClipRect( drawRect ); EraseRect( drawRect ); - ::TextFont( kFontIDMonaco ) ; - ::TextSize( 9 ); - ::TextFace( 0 ) ; + wxFontRefData * font = (wxFontRefData*) (list->GetFont().GetRefData()) ; + + if ( font ) + { + ::TextFont( font->m_macFontNum ) ; + ::TextSize( font->m_macFontSize) ; + ::TextFace( font->m_macFontStyle ) ; + } + ThemeButtonDrawInfo info ; info.state = kThemeStateActive ; info.value = checked ? kThemeButtonOn : kThemeButtonOff ; info.adornment = kThemeAdornmentNone ; Rect checkRect = *drawRect ; + + checkRect.left +=0 ; - checkRect.top +=2 ; - checkRect.right = checkRect.left + 12 ; - checkRect.bottom = checkRect.top + 10 ; + checkRect.top +=0 ; + checkRect.right = checkRect.left + list->m_checkBoxWidth ; + checkRect.bottom = checkRect.top + list->m_checkBoxHeight ; DrawThemeButton(&checkRect,kThemeCheckBox, &info,NULL,NULL, NULL,0); - MoveTo(drawRect->left + 4 + kwxMacListCheckboxWidth, drawRect->top + 10 ); + MoveTo(drawRect->left + 2 + list->m_checkBoxWidth+2, drawRect->top + list->m_TextBaseLineOffset ); DrawText(text, 0 , text.Length()); // If the cell is hilited, do the hilite now. Paint the cell contents with the // 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 +150,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 ; @@ -163,6 +186,28 @@ bool wxCheckListBox::Create(wxWindow *parent, m_noItems = 0 ; // this will be increased by our append command m_selected = 0; + m_checkBoxWidth = 12; + m_checkBoxHeight= 10; + + long h = m_checkBoxHeight ; +#if TARGET_CARBON + GetThemeMetric(kThemeMetricCheckBoxWidth,(long *)&m_checkBoxWidth); + GetThemeMetric(kThemeMetricCheckBoxHeight,&h); +#endif + wxFontRefData * font = (wxFontRefData*) (GetFont().GetRefData()) ; + + FontInfo finfo; + FetchFontInfo(font->m_macFontNum,short(font->m_macFontSize),font->m_macFontStyle,&finfo); + + m_TextBaseLineOffset= finfo.leading+finfo.ascent; + m_checkBoxHeight= finfo.leading+finfo.ascent+finfo.descent; + + if (m_checkBoxHeightMacGetRootWindow(), &bounds, false, 0, 1, false, true, - 14, 14, false, &listDef, &m_macControl ); + CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true, + m_checkBoxHeight+2, 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 , + wxStAppResource resload ; + 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 +273,7 @@ bool wxCheckListBox::Create(wxWindow *parent, { options = lOnlyOne ; } - SetListSelectionFlags(m_macList, options); + SetListSelectionFlags((ListHandle)m_macList, options); MacPostControlCreate() ; @@ -236,7 +282,7 @@ bool wxCheckListBox::Create(wxWindow *parent, Append( choices[i] ) ; } - LSetDrawingMode( true , m_macList ) ; + LSetDrawingMode( true , (ListHandle) m_macList ) ; return TRUE; } @@ -283,10 +329,12 @@ void wxCheckListBox::Delete(int n) int wxCheckListBox::DoAppend(const wxString& item) { + LSetDrawingMode( false , (ListHandle) m_macList ) ; int pos = wxListBox::DoAppend(item); // the item is initially unchecked m_checks.Insert(FALSE, pos); + LSetDrawingMode( true , (ListHandle) m_macList ) ; return pos; } @@ -352,14 +400,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 ;