///////////////////////////////////////////////////////////////////////////////
// Name: checklst.cpp
// Purpose: implementation of wxCheckListBox class
-// Author: AUTHOR
+// Author: Stefan Csomor
// Modified by:
-// Created: ??/??/98
+// Created: 1998-01-01
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
+// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
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,
RgnHandle savedClipRegion;
SInt32 savedPenMode;
wxCheckListBox* list;
- GetPort(&savePort);
- SetPort((**listHandle).port);
- grafPtr = (**listHandle).port ;
+ GetPort(&savePort);
+ SetPort((**listHandle).port);
+ grafPtr = (**listHandle).port ;
// typecast our refCon
list = (wxCheckListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
ClipRect( drawRect );
EraseRect( drawRect );
- ::TextFont( kFontIDMonaco ) ;
- ::TextSize( 9 );
- ::TextFace( 0 ) ;
+ const wxFont& font = list->GetFont();
+ if ( font.Ok() )
+ {
+ ::TextFont( font.GetMacFontNum() ) ;
+ ::TextSize( font.GetMacFontSize()) ;
+ ::TextFace( font.GetMacFontStyle() ) ;
+ }
+
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 );
-
- DrawText(text, 0 , text.Length());
+ &info,NULL,NULL, NULL,0);
+
+ 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.
SetClip( savedClipRegion );
DisposeRgn( savedClipRegion );
- }
- break;
+ }
+ break;
case lHiliteMsg:
// Hilite or unhilite the cell. Paint the cell contents with the
const wxValidator& validator,
const wxString &name)
{
+ if ( !wxCheckListBoxBase::Create(parent, id, pos, size,
+ n, choices, style, validator, name) )
+ return false;
+
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
+
+ const wxFont& font = GetFont();
+
+ FontInfo finfo;
+ FetchFontInfo(font.GetMacFontNum(),font.GetMacFontSize(),font.GetMacFontStyle(),&finfo);
+
+ m_TextBaseLineOffset= finfo.leading+finfo.ascent;
+ m_checkBoxHeight= finfo.leading+finfo.ascent+finfo.descent;
+
+ if (m_checkBoxHeight<h)
+ {
+ m_TextBaseLineOffset+= (h-m_checkBoxHeight)/2;
+ m_checkBoxHeight= h;
+ }
+
Rect bounds ;
Str255 title ;
- MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ;
+ MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;
ListDefSpec listDef;
listDef.defType = kListDefUserProcType;
CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true,
- 14, 14, false, &listDef, (ControlRef *)&m_macControl );
+ m_checkBoxHeight+2, 14, false, &listDef, (ControlRef *)&m_macControl );
GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag,
sizeof(ListHandle), (Ptr) &m_macList, &asize);
long result ;
+ wxStAppResource resload ;
m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
kwxMacListWithVerticalScrollbar , 0 , 0,
kControlListBoxProc , (long) this ) ;
}
else
{
- options = lOnlyOne ;
+ options = (OptionBits) lOnlyOne ;
}
SetListSelectionFlags((ListHandle)m_macList, options);
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;
}
void wxCheckListBox::OnChar(wxKeyEvent& event)
{
- if ( event.KeyCode() == WXK_SPACE )
- {
- int index = GetSelection() ;
- if ( index >= 0 )
+ if ( event.GetKeyCode() == WXK_SPACE )
{
- Check(index, !IsChecked(index) ) ;
- wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId());
- event.SetInt(index);
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
+ int index = GetSelection() ;
+ if ( index >= 0 )
+ {
+ Check(index, !IsChecked(index) ) ;
+ wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId());
+ event.SetInt(index);
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
+ }
}
- }
- else
- event.Skip();
+ else
+ event.Skip();
}
void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
{
- // clicking on the item selects it, clicking on the checkmark toggles
- if ( event.GetX() <= 20 /*check width*/ ) {
- int lineheight ;
- int topcell ;
+ // clicking on the item selects it, clicking on the checkmark toggles
+ if ( event.GetX() <= 20 /*check width*/ ) {
+ int lineheight ;
+ int topcell ;
#if TARGET_CARBON
- Point pt ;
- GetListCellSize( (ListHandle)m_macList , &pt ) ;
- lineheight = pt.v ;
- ListBounds visible ;
- GetListVisibleCells( (ListHandle)m_macList , &visible ) ;
- topcell = visible.top ;
+ Point pt ;
+ GetListCellSize( (ListHandle)m_macList , &pt ) ;
+ lineheight = pt.v ;
+ ListBounds visible ;
+ GetListVisibleCells( (ListHandle)m_macList , &visible ) ;
+ topcell = visible.top ;
#else
- lineheight = (**(ListHandle)m_macList).cellSize.v ;
- topcell = (**(ListHandle)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 ;
-
- if ( nItem < (size_t)m_noItems )
- {
- Check(nItem, !IsChecked(nItem) ) ;
- wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId());
- event.SetInt(nItem);
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
+ size_t nItem = ((size_t)event.GetY()) / lineheight + topcell ;
+
+ if ( nItem < (size_t)m_noItems )
+ {
+ Check(nItem, !IsChecked(nItem) ) ;
+ wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId());
+ event.SetInt(nItem);
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
+ }
+ //else: it's not an error, just click outside of client zone
+ }
+ else {
+ // implement default behaviour: clicking on the item selects it
+ event.Skip();
}
- //else: it's not an error, just click outside of client zone
- }
- else {
- // implement default behaviour: clicking on the item selects it
- event.Skip();
- }
}
#endif // wxUSE_CHECKLISTBOX
projects / wxWidgets.git / blobdiff