Applied patch for better sizing of bitmap buttons.

  Applied patch for correct order of activate and mouse down events.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 381dc7fb4281c8599448e5549be93fbcc3d54ae3..98505dac772f0b47c4eeaa31d3e5a0d71f99ad2f 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -1540,9 +1540,12 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr )
                     }
                     else
                     {
+                        // Activate window first
+                        ::SelectWindow( window ) ;
+                        
+                        // Send event later
                         if ( win )
                             win->MacMouseDown( ev , windowPart ) ;
-                        ::SelectWindow( window ) ;
                     }
                 }
                 else

diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp
index f29677665210d7a71aecda0a6ec3210ca45dcf44..9c16d3672ec1447711660173aed72f9a713e4fec 100644 (file)
--- a/src/mac/bmpbuttn.cpp
+++ b/src/mac/bmpbuttn.cpp
@@ -35,11 +35,17 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
     m_bmpNormal = bitmap;
  
-    m_marginX = 0;
-    m_marginY = 0;
+    if (style & wxBU_AUTODRAW)
+    {
+        m_marginX = wxDEFAULT_BUTTON_MARGIN;
+        m_marginY = wxDEFAULT_BUTTON_MARGIN;
+    }
+    else
+    {
+        m_marginX = 0;
+        m_marginY = 0;
+    }
 
-    // int x = pos.x;
-    // int y = pos.y;
     int width = size.x;
     int height = size.y;
 

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 381dc7fb4281c8599448e5549be93fbcc3d54ae3..98505dac772f0b47c4eeaa31d3e5a0d71f99ad2f 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1540,9 +1540,12 @@ void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr )
                     }
                     else
                     {
+                        // Activate window first
+                        ::SelectWindow( window ) ;
+                        
+                        // Send event later
                         if ( win )
                             win->MacMouseDown( ev , windowPart ) ;
-                        ::SelectWindow( window ) ;
                     }
                 }
                 else

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index f29677665210d7a71aecda0a6ec3210ca45dcf44..9c16d3672ec1447711660173aed72f9a713e4fec 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -35,11 +35,17 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
     m_bmpNormal = bitmap;
  
-    m_marginX = 0;
-    m_marginY = 0;
+    if (style & wxBU_AUTODRAW)
+    {
+        m_marginX = wxDEFAULT_BUTTON_MARGIN;
+        m_marginY = wxDEFAULT_BUTTON_MARGIN;
+    }
+    else
+    {
+        m_marginX = 0;
+        m_marginY = 0;
+    }
 
-    // int x = pos.x;
-    // int y = pos.y;
     int width = size.x;
     int height = size.y;