fixing reset clip

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

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index d1f29edb1a191514dc08dbebe5036a2ba30db419..997a557d1be91b5f64e7103b02cde8365dbfbbdd 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -1240,7 +1240,7 @@ bool wxToolBar::Realize()
     InvalidateBestSize();
 #endif
 
     InvalidateBestSize();
 #endif
 

-    SetBestFittingSize();
+    SetInitialSize();

 
     return true;
 }
 
     return true;
 }


@@ -1648,7 +1648,9 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
             drawInfo.kind = kThemeBackgroundMetal;
             HIThemeApplyBackground( &hiToolbarrect, &drawInfo, cgContext, kHIThemeOrientationNormal );
 
             drawInfo.kind = kThemeBackgroundMetal;
             HIThemeApplyBackground( &hiToolbarrect, &drawInfo, cgContext, kHIThemeOrientationNormal );
 

+#ifndef __LP64__

             QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
             QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );

+#endif

 #endif
         }
     }
 #endif
         }
     }