compilation fix (float => wxCoord)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
f76dbc4d52
commit
fd69e87d25
@ -74,7 +74,7 @@ public:
|
||||
// If toggle is TRUE, the button toggles between the two states.
|
||||
virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap,
|
||||
const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
|
||||
float xPos = -1, float yPos = -1, wxObject *clientData = (wxObject *)NULL,
|
||||
wxCoord xPos = -1, wxCoord yPos = -1, wxObject *clientData = (wxObject *)NULL,
|
||||
const wxString& helpString1 = "", const wxString& helpString2 = "");
|
||||
virtual void AddSeparator(void);
|
||||
virtual void ClearTools(void);
|
||||
|
@ -74,7 +74,7 @@ public:
|
||||
// If toggle is TRUE, the button toggles between the two states.
|
||||
virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap,
|
||||
const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
|
||||
float xPos = -1, float yPos = -1, wxObject *clientData = (wxObject *)NULL,
|
||||
wxCoord xPos = -1, wxCoord yPos = -1, wxObject *clientData = (wxObject *)NULL,
|
||||
const wxString& helpString1 = "", const wxString& helpString2 = "");
|
||||
virtual void AddSeparator(void);
|
||||
virtual void ClearTools(void);
|
||||
|
@ -265,7 +265,7 @@ void wxToolBar::OnMouseEnter( int toolIndex )
|
||||
|
||||
wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
|
||||
const wxBitmap& pushedBitmap, bool toggle,
|
||||
float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
|
||||
wxCoord WXUNUSED(xPos), wxCoord WXUNUSED(yPos), wxObject *clientData,
|
||||
const wxString& helpString1, const wxString& helpString2 )
|
||||
{
|
||||
m_hasToolAlready = TRUE;
|
||||
|
@ -265,7 +265,7 @@ void wxToolBar::OnMouseEnter( int toolIndex )
|
||||
|
||||
wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
|
||||
const wxBitmap& pushedBitmap, bool toggle,
|
||||
float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
|
||||
wxCoord WXUNUSED(xPos), wxCoord WXUNUSED(yPos), wxObject *clientData,
|
||||
const wxString& helpString1, const wxString& helpString2 )
|
||||
{
|
||||
m_hasToolAlready = TRUE;
|
||||
|
Loading…
Reference in New Issue
Block a user