Tweaked the layout sample a bit for wxGridBagSizer

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

diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp
index 150fe2e87b8cc88770eca6886caafa4822fee3ca..7de1af74e19ff94565bb00f9d9e62186556c385a 100644 (file)
--- a/src/mac/notebmac.cpp
+++ b/src/mac/notebmac.cpp
@@ -62,7 +62,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 // mode, or inset.  I think edge to edge conforms better to the other ports,
 // and inset mode is better accomplished with space around the wxNotebook rather
 // than within it.    --Robin
 // mode, or inset.  I think edge to edge conforms better to the other ports,
 // and inset mode is better accomplished with space around the wxNotebook rather
 // than within it.    --Robin

-#define wxMAC_EDGE_TO_EDGE 1
+
+// CS : had to switch off tight spacing due to 10.3 problems
+#define wxMAC_EDGE_TO_EDGE 0

 
 static inline int wxMacTabMargin(long nbStyle, long side)
 {
 
 static inline int wxMacTabMargin(long nbStyle, long side)
 {


@@ -450,7 +452,7 @@ void wxNotebook::MacSetupTabs()
             // afterwards Unregister it (IconRef is ref counted, so it will stay on the tab even if we
             // unregister it) in case this will ever lead to having the same icon everywhere add some kind
             // of static counter
             // afterwards Unregister it (IconRef is ref counted, so it will stay on the tab even if we
             // unregister it) in case this will ever lead to having the same icon everywhere add some kind
             // of static counter

-            wxBitmap* bmap = GetImageList()->GetBitmap( GetPageImage(ii ) ) ;
+            const wxBitmap* bmap = GetImageList()->GetBitmap( GetPageImage(ii ) ) ;

             if ( bmap )
             {
                 wxBitmap scaledBitmap ;
             if ( bmap )
             {
                 wxBitmap scaledBitmap ;