adapting MacHandleControlClick to know about mouse state

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

diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h
index f2cebe9e94d7d123bcdae46347675d5285d87d83..3b000943defadc3170d05f4b22a78da844a95958 100644 (file)
--- a/include/wx/mac/button.h
+++ b/include/wx/mac/button.h
@@ -42,7 +42,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 
-    virtual void MacHandleControlClick( WXWidget control , short controlpart ) ;
+    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
     static wxSize GetDefaultSize();
 
   virtual void SetDefault();

diff --git a/include/wx/mac/checkbox.h b/include/wx/mac/checkbox.h
index 06d6815080c9aad88cd65f8856994ffc16a1d7f7..e969d100ac7cf3382c68973808f84f55e70874b5 100644 (file)
--- a/include/wx/mac/checkbox.h
+++ b/include/wx/mac/checkbox.h
@@ -37,7 +37,7 @@ public:
             const wxString& name = wxCheckBoxNameStr);
     virtual void SetValue(bool);
     virtual bool GetValue() const;
-    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart );
+    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown );
     virtual void Command(wxCommandEvent& event);
 
     DECLARE_DYNAMIC_CLASS(wxCheckBox)

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index d22ca43d6852cb596328c47b1565a5cd61c67a8a..3f9909e0315e7911ba97024cc562dee0bb78c7e4 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -68,24 +68,8 @@ public:
   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 ) ;
-
-/*
-  virtual void Append(const wxString& item);
-  // Added min Append and GetClientData
-  virtual void Append(const wxString& item, void *client_data);
-  virtual void *GetClientData(int index) const;
-  virtual inline void Select( int n ) { SetSelection( n ); }
-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  virtual wxString GetStringSelection() const ;
-  virtual bool SetStringSelection(const wxString& sel);
-
-  // Mac specific
-  virtual void Command(wxCommandEvent& event);
-  void        MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
-
-  virtual inline int GetColumns() const { return 1 ; };
-*/
+    void        MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+
 protected:
     virtual wxSize DoGetBestSize() const ;
     virtual void DoSetItemClientData( int n, void* clientData );

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index 8c14d461e1c45ebf3a7bb8e6cbba39499335cd77..d39c5c624ad946d98e1badb738c0a9d45e75fdd9 100644 (file)
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -59,7 +59,7 @@ public:
    virtual bool             Show(bool show = TRUE) ;
 
    virtual void         MacRedrawControl () ;
-   virtual void      MacHandleControlClick( WXWidget control , short controlpart ) ;
+   virtual void      MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
    virtual void             MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label ,
                           const wxPoint& pos,
                           const wxSize& size, long style,

diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h
index ed538622dd5e6a9c06096b0c3275f84a89ee2689..9e0bd5af33da35bf85ce365101a72d9370becc6f 100644 (file)
--- a/include/wx/mac/listbox.h
+++ b/include/wx/mac/listbox.h
@@ -111,7 +111,7 @@ public:
     // Windows callbacks
 
     virtual void    SetupColours();
-    virtual void    MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+    virtual void    MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
        virtual bool MacCanFocus() const { return true ; }
     void OnChar(wxKeyEvent& event);
 

diff --git a/include/wx/mac/notebook.h b/include/wx/mac/notebook.h
index 80569fc2449e678b59503f04240b83a54d353f8f..76f43438eb653d634ea1c6742e7e6bc90bb380a9 100644 (file)
--- a/include/wx/mac/notebook.h
+++ b/include/wx/mac/notebook.h
@@ -135,7 +135,7 @@ public:
   virtual void Command(wxCommandEvent& event);
 protected:
     virtual wxNotebookPage *DoRemovePage(int page) ;
-    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
   // common part of all ctors
   void Init();
 

diff --git a/include/wx/mac/radiobut.h b/include/wx/mac/radiobut.h
index 74dfccde46d7c10793f3c08e8006d38e74bd9ee1..a6999516bbaf9667a5671f5432f973fa60fe48d5 100644 (file)
--- a/include/wx/mac/radiobut.h
+++ b/include/wx/mac/radiobut.h
@@ -44,7 +44,7 @@ public:
 
     // implementation 
     
-      virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ); 
+      virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ); 
     void Command(wxCommandEvent& event);
     wxRadioButton *AddInCycle(wxRadioButton *cycle);
     inline wxRadioButton *NextInCycle() {return m_cycle;}

diff --git a/include/wx/mac/scrolbar.h b/include/wx/mac/scrolbar.h
index 13c8383c8ebbe05ca2d501112630055c3f3a0399..bac1fca23934a0d5d5fb1e4baf481c5eac50eddd 100644 (file)
--- a/include/wx/mac/scrolbar.h
+++ b/include/wx/mac/scrolbar.h
@@ -57,7 +57,7 @@ public:
     bool refresh = TRUE);
 
   void Command(wxCommandEvent& event);
-        virtual void                         MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+        virtual void                         MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
 
 protected:
     int m_pageSize;

diff --git a/include/wx/mac/slider.h b/include/wx/mac/slider.h
index d599d32c0fc688ccee4966f979428ca9ca867616..db747cda720c552e9d0110d20d542a8b2cbbdc94 100644 (file)
--- a/include/wx/mac/slider.h
+++ b/include/wx/mac/slider.h
@@ -87,7 +87,7 @@ public:
      virtual void   DoMoveWindow(int x, int y, int w, int h);
  
   void Command(wxCommandEvent& event);
-    void                     MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+    void                     MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
     virtual void            MacUpdateDimensions() ;
 
      wxStaticText*    m_macMinimumStatic ;

diff --git a/include/wx/mac/spinbutt.h b/include/wx/mac/spinbutt.h
index b29866c5e5245ded50a2699ec67c13da9dce159b..c51e3588970ac96558d3cd144d7d16a5dc8408fa 100644 (file)
--- a/include/wx/mac/spinbutt.h
+++ b/include/wx/mac/spinbutt.h
@@ -64,7 +64,7 @@ public:
 
     // implementation
     
-    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
 
 protected:
     void         MacHandleValueChanged( int inc ) ;

diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h
index d43db1e1ecccba336b3b02e389231aaa9b96f6ec..c6c02dfed086b14ef70dc39c685e80d4be59bc5c 100644 (file)
--- a/include/wx/mac/toolbar.h
+++ b/include/wx/mac/toolbar.h
@@ -60,7 +60,7 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
 
   // Add all the buttons
 
-    virtual void MacHandleControlClick( WXWidget control , short controlpart ) ;
+    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
     virtual wxString MacGetToolTipString( wxPoint &where ) ;
     void OnPaint(wxPaintEvent& event) ;
     void OnMouse(wxMouseEvent& event) ;