Updates for tooltip support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
536a020f8a
commit
6c0fdfbb42
@ -61,11 +61,16 @@ public:
|
||||
virtual void SetValue(bool bVal);
|
||||
virtual bool GetValue(void) const ;
|
||||
|
||||
bool OS2Command( WXUINT wParam
|
||||
,WXWORD wId
|
||||
);
|
||||
void Command(wxCommandEvent& rEvent);
|
||||
virtual void SetFocus(void);
|
||||
bool OS2Command( WXUINT wParam
|
||||
,WXWORD wId
|
||||
);
|
||||
void Command(wxCommandEvent& rEvent);
|
||||
virtual MRESULT OS2WindowProc( WXUINT uMsg
|
||||
,WXWPARAM wParam
|
||||
,WXLPARAM lParam
|
||||
);
|
||||
virtual void SetFocus(void);
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
|
@ -29,6 +29,7 @@ public:
|
||||
{ Init(); }
|
||||
~wxTimer();
|
||||
|
||||
virtual void Notify(void);
|
||||
virtual bool Start( int nMilliseconds = -1
|
||||
,bool bOneShot = FALSE
|
||||
);
|
||||
|
@ -15,6 +15,9 @@
|
||||
#if wxUSE_TOOLBAR
|
||||
#include "wx/tbarbase.h"
|
||||
|
||||
#define ID_TOOLTIMER 100
|
||||
#define ID_TOOLEXPTIMER 101
|
||||
|
||||
class WXDLLEXPORT wxToolBar: public wxToolBarBase
|
||||
{
|
||||
public:
|
||||
@ -22,7 +25,10 @@ public:
|
||||
* Public interface
|
||||
*/
|
||||
|
||||
wxToolBar() { Init(); }
|
||||
wxToolBar()
|
||||
: m_vToolTimer(this, ID_TOOLTIMER)
|
||||
, m_vToolExpTimer(this, ID_TOOLEXPTIMER)
|
||||
{ Init(); }
|
||||
|
||||
inline wxToolBar( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
@ -30,7 +36,8 @@ public:
|
||||
,const wxSize& rSize = wxDefaultSize
|
||||
,long lStyle = wxNO_BORDER | wxTB_HORIZONTAL
|
||||
,const wxString& rName = wxToolBarNameStr
|
||||
)
|
||||
) : m_vToolTimer(this, ID_TOOLTIMER)
|
||||
, m_vToolExpTimer(this, ID_TOOLEXPTIMER)
|
||||
{
|
||||
Init();
|
||||
Create( pParent
|
||||
@ -187,9 +194,15 @@ private:
|
||||
void RaiseTool( wxToolBarToolBase* pTool
|
||||
,bool bRaise = TRUE
|
||||
);
|
||||
void OnTimer(wxTimerEvent& rEvent);
|
||||
|
||||
static bool m_bInitialized;
|
||||
|
||||
wxTimer m_vToolTimer;
|
||||
wxTimer m_vToolExpTimer;
|
||||
ULONG m_ulToolTimer;
|
||||
ULONG m_ulToolExpTimer;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS(wxToolBar)
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user