compositing and transition changes

[wxWidgets.git] / src / mac / carbon / checklst.cpp

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 95f2e86fa167dff86f4dff3d66942feeee011618..1e88ce34f6cce33300cbf0c4d472812253fd1105 100644 (file)
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        checklst.cpp
 // Purpose:     implementation of wxCheckListBox class
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        checklst.cpp
 // Purpose:     implementation of wxCheckListBox class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by: 
 // Modified by: 

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -73,9 +73,9 @@ static pascal void wxMacCheckListDefinition( short message, Boolean isSelected,
     RgnHandle savedClipRegion;
     SInt32 savedPenMode;
     wxCheckListBox*          list;
     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) );
     
     // typecast our refCon
     list = (wxCheckListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
     


@@ -102,24 +102,31 @@ static pascal void wxMacCheckListDefinition( short message, Boolean isSelected,
             ClipRect( drawRect );
             EraseRect( drawRect );
             
             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 ;
             ThemeButtonDrawInfo info ;
             info.state = kThemeStateActive ;
             info.value = checked ? kThemeButtonOn : kThemeButtonOff ;
             info.adornment = kThemeAdornmentNone ;
             Rect checkRect = *drawRect ;

+                        
+            

             checkRect.left +=0 ;
             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,
             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.
             
             //  If the cell is hilited, do the hilite now. Paint the cell contents with the
             //  appropriate QuickDraw transform mode.
             


@@ -134,8 +141,8 @@ static pascal void wxMacCheckListDefinition( short message, Boolean isSelected,
             
             SetClip( savedClipRegion );
             DisposeRgn( savedClipRegion );
             
             SetClip( savedClipRegion );
             DisposeRgn( savedClipRegion );

-            }
-            break;
+        }
+        break;

         case lHiliteMsg:
             
             //  Hilite or unhilite the cell. Paint the cell contents with the
         case lHiliteMsg:
             
             //  Hilite or unhilite the cell. Paint the cell contents with the


@@ -175,13 +182,40 @@ bool wxCheckListBox::Create(wxWindow *parent,
                             const wxValidator& validator,
                             const wxString &name)
 {
                             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_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 ;
     
     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;
 
     ListDefSpec listDef;
     listDef.defType = kListDefUserProcType;


@@ -196,7 +230,7 @@ bool wxCheckListBox::Create(wxWindow *parent,
 
 
     CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true,
 
 
     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);
 
     GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag,
                    sizeof(ListHandle), (Ptr) &m_macList, &asize);


@@ -241,7 +275,7 @@ bool wxCheckListBox::Create(wxWindow *parent,
     }
     else
     {
     }
     else
     {

-        options = lOnlyOne ;
+        options = (OptionBits) lOnlyOne ;

     }
     SetListSelectionFlags((ListHandle)m_macList, options);
     
     }
     SetListSelectionFlags((ListHandle)m_macList, options);
     


@@ -299,10 +333,12 @@ void wxCheckListBox::Delete(int n)
 
 int wxCheckListBox::DoAppend(const wxString& item)
 {
 
 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);
     int pos = wxListBox::DoAppend(item);
 
     // the item is initially unchecked
     m_checks.Insert(FALSE, pos);

+    LSetDrawingMode( true , (ListHandle) m_macList ) ;

 
     return pos;
 }
 
     return pos;
 }


@@ -344,55 +380,55 @@ END_EVENT_TABLE()
 
 void wxCheckListBox::OnChar(wxKeyEvent& event)
 {
 
 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)
 {
 }
 
 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
 #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
 #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
 #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
 }
 
 #endif // wxUSE_CHECKLISTBOX