adapting MacHandleControlClick to know about mouse state
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3ba18664fc
commit
69b85ca49b
@ -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();
|
||||
|
@ -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)
|
||||
|
@ -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 ) ;
|
||||
void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
|
||||
|
||||
/*
|
||||
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 ; };
|
||||
*/
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const ;
|
||||
virtual void DoSetItemClientData( int n, void* clientData );
|
||||
|
@ -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,
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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;}
|
||||
|
@ -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;
|
||||
|
@ -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 ;
|
||||
|
@ -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 ) ;
|
||||
|
@ -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) ;
|
||||
|
Loading…
Reference in New Issue
Block a user