projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Send EVT_DATAVIEW_ITEM_CONTEXT_MENU events even when not clicking on an item.
[wxWidgets.git]
/
include
/
wx
/
os2
/
toolbar.h
diff --git
a/include/wx/os2/toolbar.h
b/include/wx/os2/toolbar.h
index 608d65311a0e7603fa10907e70dfdb43f7870e89..b38fb1579ad5202871d4e7b1663f54b02a210dc2 100644
(file)
--- a/
include/wx/os2/toolbar.h
+++ b/
include/wx/os2/toolbar.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: toolbar.h
+// Name:
wx/os2/
toolbar.h
// Purpose: wxToolBar class
// Author: David Webster
// Modified by:
// Purpose: wxToolBar class
// Author: David Webster
// Modified by:
@@
-13,12
+13,13
@@
#define _WX_TOOLBAR_H_
#if wxUSE_TOOLBAR
#define _WX_TOOLBAR_H_
#if wxUSE_TOOLBAR
+#include "wx/timer.h"
#include "wx/tbarbase.h"
#define ID_TOOLTIMER 100
#define ID_TOOLEXPTIMER 101
#include "wx/tbarbase.h"
#define ID_TOOLTIMER 100
#define ID_TOOLEXPTIMER 101
-class WXDLL
EXPORT
wxToolBar: public wxToolBarBase
+class WXDLL
IMPEXP_CORE
wxToolBar: public wxToolBarBase
{
public:
/*
{
public:
/*
@@
-164,7
+165,8
@@
protected:
,const wxString& rsShortHelp
,const wxString& rsLongHelp
);
,const wxString& rsShortHelp
,const wxString& rsLongHelp
);
- virtual wxToolBarToolBase* CreateTool(wxControl* pControl);
+ virtual wxToolBarToolBase* CreateTool(wxControl* pControl,
+ const wxString& label);
//
// Helpers
//
// Helpers
@@
-204,6
+206,15
@@
private:
wxCoord m_vXMouse;
wxCoord m_vYMouse;
wxCoord m_vXMouse;
wxCoord m_vYMouse;
+ //
+ // Virtual function hiding supression
+ virtual wxToolBarToolBase *InsertTool (size_t nPos, wxToolBarToolBase* pTool)
+ {
+ return( wxToolBarBase::InsertTool( nPos
+ ,pTool
+ ));
+ }
+
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxToolBar)
};
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxToolBar)
};