From 69b85ca49b0ac601c285e84294ac50be9dfc5291 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 7 Jun 2003 20:29:57 +0000 Subject: [PATCH] adapting MacHandleControlClick to know about mouse state git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/button.h | 2 +- include/wx/mac/checkbox.h | 2 +- include/wx/mac/choice.h | 20 ++------------------ include/wx/mac/control.h | 2 +- include/wx/mac/listbox.h | 2 +- include/wx/mac/notebook.h | 2 +- include/wx/mac/radiobut.h | 2 +- include/wx/mac/scrolbar.h | 2 +- include/wx/mac/slider.h | 2 +- include/wx/mac/spinbutt.h | 2 +- include/wx/mac/toolbar.h | 2 +- 11 files changed, 12 insertions(+), 28 deletions(-) diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h index f2cebe9e94..3b000943de 100644 --- 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 06d6815080..e969d100ac 100644 --- 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 d22ca43d68..3f9909e031 100644 --- 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 8c14d461e1..d39c5c624a 100644 --- 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 ed538622dd..9e0bd5af33 100644 --- 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 80569fc244..76f43438eb 100644 --- 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 74dfccde46..a6999516bb 100644 --- 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 13c8383c8e..bac1fca239 100644 --- 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 d599d32c0f..db747cda72 100644 --- 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 b29866c5e5..c51e358897 100644 --- 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 d43db1e1ec..c6c02dfed0 100644 --- 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) ; -- 2.45.2