added spinctrl to be ignored when clicked (otherwise its siblings on the same window...

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 8cd9a947a13bc43ef280ce29d89431aa8d81745d..a821346eefc42a73f8aeebd4fc9e1c7e31a55294 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -35,6 +35,7 @@
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"

+#include "wx/spinctrl.h"

 #include "wx/log.h"
 
 #if wxUSE_CARET
 #include "wx/log.h"
 
 #if wxUSE_CARET


@@ -124,6 +125,8 @@ void wxWindowMac::Init()
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;

+
+    m_label = wxEmptyString;

 }
 
 // Destructor
 }
 
 // Destructor


@@ -676,12 +679,12 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const
     return wxPoint(MacGetLeftBorderSize(  ) , MacGetTopBorderSize(  ) );
 }
 
     return wxPoint(MacGetLeftBorderSize(  ) , MacGetTopBorderSize(  ) );
 }
 

-void wxWindow::SetTitle(const wxString& title)
+void wxWindowMac::SetTitle(const wxString& title)

 {
     m_label = title ;
 }
 
 {
     m_label = title ;
 }
 

-wxString wxWindow::GetTitle() const
+wxString wxWindowMac::GetTitle() const

 {
     return m_label ;
 }
 {
     return m_label ;
 }


@@ -1072,6 +1075,16 @@ void wxWindowMac::MacPaintBorders( int left , int top )
     }
 }
 
     }
 }
 

+void wxWindowMac::RemoveChild( wxWindowBase *child )
+{
+    if ( child == m_hScrollBar )
+        m_hScrollBar = NULL ;
+    if ( child == m_vScrollBar )
+        m_vScrollBar = NULL ;
+      
+    wxWindowBase::RemoveChild( child ) ;
+}
+

 // New function that will replace some of the above.
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 // New function that will replace some of the above.
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)


@@ -1376,6 +1389,7 @@ bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMa
 }
 
 extern int wxBusyCursorCount ;
 }
 
 extern int wxBusyCursorCount ;

+static wxWindow *gs_lastWhich = NULL;

 
 bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
 {
 
 bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
 {


@@ -1384,7 +1398,7 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
         return FALSE;
     
 
         return FALSE;
     
 

-    if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) )
+    if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) || IsKindOf( CLASSINFO( wxSpinCtrl ) ))

         return FALSE ; 
     
     WindowRef window = (WindowRef) MacGetRootWindow() ;
         return FALSE ; 
     
     WindowRef window = (WindowRef) MacGetRootWindow() ;


@@ -1407,6 +1421,7 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
 
     event.m_x = x ;
     event.m_y = y ;
 
     event.m_x = x ;
     event.m_y = y ;

+    event.SetEventObject( this ) ;

     
     if ( wxBusyCursorCount == 0 )
     {
     
     if ( wxBusyCursorCount == 0 )
     {


@@ -1427,6 +1442,23 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
         wxToolTip::RelayEvent( this , event);
 #endif // wxUSE_TOOLTIPS
 
         wxToolTip::RelayEvent( this , event);
 #endif // wxUSE_TOOLTIPS
 

+    if (gs_lastWhich != this)
+    {
+        gs_lastWhich = this;
+        
+        // Double clicks must always occur on the same window
+        if (event.GetEventType() == wxEVT_LEFT_DCLICK)
+            event.SetEventType( wxEVT_LEFT_DOWN );
+        if (event.GetEventType() == wxEVT_RIGHT_DCLICK)
+            event.SetEventType( wxEVT_RIGHT_DOWN );
+            
+        // Same for mouse up events
+        if (event.GetEventType() == wxEVT_LEFT_UP)
+            return TRUE;
+        if (event.GetEventType() == wxEVT_RIGHT_UP)
+            return TRUE;
+    }
+

     GetEventHandler()->ProcessEvent( event ) ;
 
     return TRUE;
     GetEventHandler()->ProcessEvent( event ) ;
 
     return TRUE;


@@ -1447,10 +1479,12 @@ void wxWindowMac::Update()
     if ( win )
     {
       win->MacUpdate( 0 ) ;
     if ( win )
     {
       win->MacUpdate( 0 ) ;

+#if TARGET_API_MAC_CARBON

         if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) )
         {
                 QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ;
         }
         if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) )
         {
                 QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ;
         }

+#endif

       }
 }
 
       }
 }