switching to native focus and control hit handling

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

diff --git a/include/wx/mac/carbon/button.h b/include/wx/mac/carbon/button.h
index 23e9044f00a29549c60d74909c7494d7f7a3676e..713b93da96d1d11f3ddf2222c28ddea69a16f6af 100644 (file)
--- a/include/wx/mac/carbon/button.h
+++ b/include/wx/mac/carbon/button.h
@@ -42,7 +42,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 

-    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

     static wxSize GetDefaultSize();
 
   virtual void SetDefault();
     static wxSize GetDefaultSize();
 
   virtual void SetDefault();

diff --git a/include/wx/mac/carbon/checkbox.h b/include/wx/mac/carbon/checkbox.h
index a426cb734bb66cf743bee6f84b534890c63f0ff0..7dcfeb8f9b1c18d2da07080f22521ea54ef84d5d 100644 (file)
--- a/include/wx/mac/carbon/checkbox.h
+++ b/include/wx/mac/carbon/checkbox.h
@@ -41,7 +41,7 @@ public:
     void DoSet3StateValue(wxCheckBoxState val);
     virtual wxCheckBoxState DoGet3StateValue() const;
 
     void DoSet3StateValue(wxCheckBoxState val);
     virtual wxCheckBoxState DoGet3StateValue() const;
 

-    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown );
+    virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

     virtual void Command(wxCommandEvent& event);
 
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
     virtual void Command(wxCommandEvent& event);
 
     DECLARE_DYNAMIC_CLASS(wxCheckBox)

diff --git a/include/wx/mac/carbon/choice.h b/include/wx/mac/carbon/choice.h
index 4c10bab315ef2574864ab567a4f30ebd731c291b..7e9b5abcc0596d303d57ae00d6d2ef12e72fc3c5 100644 (file)
--- a/include/wx/mac/carbon/choice.h
+++ b/include/wx/mac/carbon/choice.h
@@ -86,7 +86,7 @@ public:
   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual void SetString( int , const wxString& s ) ;
   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual void SetString( int , const wxString& s ) ;

-    void        MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+  virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

 
 protected:
     virtual wxSize DoGetBestSize() const ;
 
 protected:
     virtual wxSize DoGetBestSize() const ;

diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h
index 68b3b0282074b94315b119bca3c93ca6f3b54f6a..8acef5176c103c0571ff45c4e018ea58cc5ad773 100644 (file)
--- a/include/wx/mac/carbon/combobox.h
+++ b/include/wx/mac/carbon/combobox.h
@@ -112,7 +112,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
     virtual int GetCount() const { return m_choice->GetCount() ; }
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
     virtual int GetCount() const { return m_choice->GetCount() ; }

-    void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 

diff --git a/include/wx/mac/carbon/listbox.h b/include/wx/mac/carbon/listbox.h
index a121ab78256cbf850a6c5333b0602284f2645bde..ecb867cdd36d14b61a06008265843808818d8f77 100644 (file)
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -127,8 +127,6 @@ public:
 
     // Windows callbacks
 
 
     // Windows callbacks
 

-    virtual void    MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
-       virtual bool MacCanFocus() const { return true ; }

     void OnChar(wxKeyEvent& event);
 
     void*           m_macList ;
     void OnChar(wxKeyEvent& event);
 
     void*           m_macList ;

diff --git a/include/wx/mac/carbon/notebook.h b/include/wx/mac/carbon/notebook.h
index 7f3724805c0ef29d8e2bcda896564874439a9a18..63356daf75cea97ea98f3c77beddd0414516a4fc 100644 (file)
--- a/include/wx/mac/carbon/notebook.h
+++ b/include/wx/mac/carbon/notebook.h
@@ -119,7 +119,6 @@ public:
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);

-  void OnMouse(wxMouseEvent &event);  

 
     // implementation
     // --------------
 
     // implementation
     // --------------


@@ -136,7 +135,7 @@ public:
 protected:
   virtual wxSize DoGetBestSize() const ;
   virtual wxNotebookPage *DoRemovePage(size_t page) ;
 protected:
   virtual wxSize DoGetBestSize() const ;
   virtual wxNotebookPage *DoRemovePage(size_t page) ;

-  virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+  virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

   // common part of all ctors
   void Init();
 
   // common part of all ctors
   void Init();
 

diff --git a/include/wx/mac/carbon/radiobut.h b/include/wx/mac/carbon/radiobut.h
index 22fe9c1bda6492f40ae47b97d4706ebc8514f2a9..c0732eb32f9ea991dcc679feb8fa3f9912ad9df6 100644 (file)
--- a/include/wx/mac/carbon/radiobut.h
+++ b/include/wx/mac/carbon/radiobut.h
@@ -44,7 +44,7 @@ public:
 
     // implementation 
     
 
     // implementation 
     

-      virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ); 
+      virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

     void Command(wxCommandEvent& event);
     wxRadioButton *AddInCycle(wxRadioButton *cycle);
     inline wxRadioButton *NextInCycle() {return m_cycle;}
     void Command(wxCommandEvent& event);
     wxRadioButton *AddInCycle(wxRadioButton *cycle);
     inline wxRadioButton *NextInCycle() {return m_cycle;}

diff --git a/include/wx/mac/carbon/scrolbar.h b/include/wx/mac/carbon/scrolbar.h
index 633b615cedf9cd55268a53d1c1cfd376aa2f1116..728049089afd2c1b54c366039c51e858dbd0711c 100644 (file)
--- a/include/wx/mac/carbon/scrolbar.h
+++ b/include/wx/mac/carbon/scrolbar.h
@@ -57,8 +57,8 @@ public:
     bool refresh = TRUE);
 
   void Command(wxCommandEvent& event);
     bool refresh = TRUE);
 
   void Command(wxCommandEvent& event);

-        virtual void                         MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
-
+    virtual void  MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) ;

 protected:
     int m_pageSize;
     int m_viewSize;
 protected:
     int m_pageSize;
     int m_viewSize;

diff --git a/include/wx/mac/carbon/slider.h b/include/wx/mac/carbon/slider.h
index ec96420817aa3d9182db527c96da5eb1cda7dbcf..b0f65bd36b22b6ddc040a545f5bcfdb7ae0181a6 100644 (file)
--- a/include/wx/mac/carbon/slider.h
+++ b/include/wx/mac/carbon/slider.h
@@ -90,6 +90,7 @@ public:
      virtual void   DoMoveWindow(int x, int y, int w, int h);
  
   void Command(wxCommandEvent& event);
      virtual void   DoMoveWindow(int x, int y, int w, int h);
  
   void Command(wxCommandEvent& event);

+    virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

     void                     MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
 
      wxStaticText*    m_macMinimumStatic ;
     void                     MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
 
      wxStaticText*    m_macMinimumStatic ;

diff --git a/include/wx/mac/carbon/spinbutt.h b/include/wx/mac/carbon/spinbutt.h
index 3b33a8d5ad823cf5d78806406ace5d4bfde46e3a..8c9295a5d2efa05ca86ead04f02da73f37d13874 100644 (file)
--- a/include/wx/mac/carbon/spinbutt.h
+++ b/include/wx/mac/carbon/spinbutt.h
@@ -64,7 +64,7 @@ public:
 
     // implementation
     
 
     // implementation
     

-    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

 
 protected:
     void         MacHandleValueChanged( int inc ) ;
 
 protected:
     void         MacHandleValueChanged( int inc ) ;

diff --git a/include/wx/mac/carbon/tglbtn.h b/include/wx/mac/carbon/tglbtn.h
index 5ab29aa84c7dac79d20888323c0524ad5eb180f6..9b2a592e77fa012e07bc9e8ba0fe2e8b6b8c3dde 100644 (file)
--- a/include/wx/mac/carbon/tglbtn.h
+++ b/include/wx/mac/carbon/tglbtn.h
@@ -44,7 +44,7 @@ public:
     virtual void SetValue(bool value);
     virtual bool GetValue() const ;
 
     virtual void SetValue(bool value);
     virtual bool GetValue() const ;
 

-    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

 
     virtual void Command(wxCommandEvent& event);
 
 
     virtual void Command(wxCommandEvent& event);
 

diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h
index 1849125750ba3bead7d493cfce68ffd686ca6515..1aab6d801de46c4766289e8eb029608183903a82 100644 (file)
--- a/include/wx/mac/carbon/toolbar.h
+++ b/include/wx/mac/carbon/toolbar.h
@@ -60,7 +60,6 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
 
   // Add all the buttons
 
 
   // Add all the buttons
 

-    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;

     virtual wxString MacGetToolTipString( wxPoint &where ) ;
     void OnPaint(wxPaintEvent& event) ;
     void OnMouse(wxMouseEvent& event) ;
     virtual wxString MacGetToolTipString( wxPoint &where ) ;
     void OnPaint(wxPaintEvent& event) ;
     void OnMouse(wxMouseEvent& event) ;

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 2d2258c7e21c449afa85801bd197e3e55fd3f72d..1b3dda550381ff6d63ea2958a439e647df36b283 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -185,6 +185,7 @@ public:
     virtual void        MacVisibilityChanged() ;
     virtual void        MacEnabledStateChanged() ;
     virtual void        MacHiliteChanged() ;
     virtual void        MacVisibilityChanged() ;
     virtual void        MacEnabledStateChanged() ;
     virtual void        MacHiliteChanged() ;

+    virtual wxInt32     MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

     
     bool                MacIsReallyShown() ;
     bool                MacIsReallyEnabled() ;
     
     bool                MacIsReallyShown() ;
     bool                MacIsReallyEnabled() ;