fix when bitmap is not valid

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

diff --git a/src/mac/checklst.cpp b/src/mac/checklst.cpp
index 743fea9aac14ba3bed9b28fb38754f716113f023..bba473b6069bfee3dc3377d1cb5f143872cf51c9 100644 (file)
--- 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 ;
 
 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;
 
 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,
 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 )
 {
                                      Cell cell, short dataOffset, short dataLength,
                                      ListHandle listHandle )
 {

-    FontInfo fontInfo;

     GrafPtr savePort;
     GrafPtr grafPtr;
     RgnHandle savedClipRegion;
     GrafPtr savePort;
     GrafPtr grafPtr;
     RgnHandle savedClipRegion;


@@ -87,22 +102,30 @@ static pascal void wxMacCheckListDefinition( short message, Boolean isSelected,
             ClipRect( drawRect );
             EraseRect( drawRect );
             
             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 ;
             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,
               &info,NULL,NULL, NULL,0);
 
             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
  
         DrawText(text, 0 , text.Length());
             //  If the cell is hilited, do the hilite now. Paint the cell contents with the


@@ -163,6 +186,28 @@ bool wxCheckListBox::Create(wxWindow *parent,
     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
+         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 ;
     
     Rect bounds ;
     Str255 title ;
     


@@ -180,8 +225,8 @@ bool wxCheckListBox::Create(wxWindow *parent,
     Size asize;
 
 
     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,
+                          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);


@@ -193,6 +238,7 @@ bool wxCheckListBox::Create(wxWindow *parent,
 
     long    result ;
 
 
     long    result ;
 

+    wxStAppResource resload ;

     m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
                   kwxMacListWithVerticalScrollbar , 0 , 0, 
                   kControlListBoxProc , (long) this ) ;
     m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
                   kwxMacListWithVerticalScrollbar , 0 , 0, 
                   kControlListBoxProc , (long) this ) ;


@@ -283,10 +329,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;
 }


@@ -352,10 +400,10 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
     int topcell ;
 #if TARGET_CARBON
     Point pt ;
     int topcell ;
 #if TARGET_CARBON
     Point pt ;

-    GetListCellSize( m_macList , &pt ) ;
+    GetListCellSize( (ListHandle)m_macList , &pt ) ;

     lineheight = pt.v ;
     ListBounds visible ;
     lineheight = pt.v ;
     ListBounds visible ;

-    GetListVisibleCells( m_macList , &visible ) ;
+    GetListVisibleCells( (ListHandle)m_macList , &visible ) ;

     topcell = visible.top ;
 #else
     lineheight =  (**(ListHandle)m_macList).cellSize.v ;
     topcell = visible.top ;
 #else
     lineheight =  (**(ListHandle)m_macList).cellSize.v ;