- better behaviour of wxMGL's wxTimer w.r.t. memory allocations

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

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 5c2a5d785d6f519cfc5ccbced383e2a12fca5c4b..8c19e3cec28ee9585c8508cd60fa0213d8038fde 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -609,6 +609,7 @@ void  wxControl::DoSetSize(int x, int y,
                              m_width - 2 * m_macHorizontalBorder,
                              m_height -  2 * m_macVerticalBorder ) ;
  
                              m_width - 2 * m_macHorizontalBorder,
                              m_height -  2 * m_macVerticalBorder ) ;
  

+ 

              wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
              event.SetEventObject(this);
              GetEventHandler()->ProcessEvent(event);
              wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
              event.SetEventObject(this);
              GetEventHandler()->ProcessEvent(event);


@@ -854,7 +855,7 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
                                {
                                        controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
                                        wxTheApp->s_lastMouseDown = 0 ;
                                {
                                        controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
                                        wxTheApp->s_lastMouseDown = 0 ;

-                                       if ( control && controlpart != kControlNoPart &&
+                                       if ( control && controlpart != kControlNoPart && 

                                            ! IsKindOf( CLASSINFO( wxScrollBar ) ) 
                                        ) // otherwise we will get the event twice for scrollbar
                                        {
                                            ! IsKindOf( CLASSINFO( wxScrollBar ) ) 
                                        ) // otherwise we will get the event twice for scrollbar
                                        {