removed XPM handler from wxImage's standard handlers, let's see if it does any harm

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

diff --git a/src/mac/checklst.cpp b/src/mac/checklst.cpp
index 4f8bc5723bc94eb92fb28afbd4ab1de907560f89..3bb48dec081ef03c916d8974cdc6ef0a227e93ac 100644 (file)
--- a/src/mac/checklst.cpp
+++ b/src/mac/checklst.cpp
@@ -102,22 +102,30 @@ 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
@@ -178,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_checkBoxHeight<h)
+       {
+               m_TextBaseLineOffset+= (h-m_checkBoxHeight)/2;
+               m_checkBoxHeight= h;
+       }
+               
     Rect bounds ;
     Str255 title ;
     
@@ -196,7 +226,7 @@ bool wxCheckListBox::Create(wxWindow *parent,
 
 
     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);
@@ -208,6 +238,7 @@ bool wxCheckListBox::Create(wxWindow *parent,
 
     long    result ;
 
+    wxStAppResource resload ;
     m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
                   kwxMacListWithVerticalScrollbar , 0 , 0, 
                   kControlListBoxProc , (long) this ) ;
@@ -240,7 +271,7 @@ bool wxCheckListBox::Create(wxWindow *parent,
     }
     else
     {
-        options = lOnlyOne ;
+        options = (OptionBits) lOnlyOne ;
     }
     SetListSelectionFlags((ListHandle)m_macList, options);
     
@@ -298,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;
 }