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:
@@ -74,7 +74,7 @@ public:
|
|||||||
// If toggle is TRUE, the button toggles between the two states.
|
// If toggle is TRUE, the button toggles between the two states.
|
||||||
virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap,
|
virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap,
|
||||||
const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
|
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 = "");
|
const wxString& helpString1 = "", const wxString& helpString2 = "");
|
||||||
virtual void AddSeparator(void);
|
virtual void AddSeparator(void);
|
||||||
virtual void ClearTools(void);
|
virtual void ClearTools(void);
|
||||||
|
@@ -74,7 +74,7 @@ public:
|
|||||||
// If toggle is TRUE, the button toggles between the two states.
|
// If toggle is TRUE, the button toggles between the two states.
|
||||||
virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap,
|
virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap,
|
||||||
const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
|
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 = "");
|
const wxString& helpString1 = "", const wxString& helpString2 = "");
|
||||||
virtual void AddSeparator(void);
|
virtual void AddSeparator(void);
|
||||||
virtual void ClearTools(void);
|
virtual void ClearTools(void);
|
||||||
|
@@ -265,7 +265,7 @@ void wxToolBar::OnMouseEnter( int toolIndex )
|
|||||||
|
|
||||||
wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
|
wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
|
||||||
const wxBitmap& pushedBitmap, bool toggle,
|
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 )
|
const wxString& helpString1, const wxString& helpString2 )
|
||||||
{
|
{
|
||||||
m_hasToolAlready = TRUE;
|
m_hasToolAlready = TRUE;
|
||||||
|
@@ -265,7 +265,7 @@ void wxToolBar::OnMouseEnter( int toolIndex )
|
|||||||
|
|
||||||
wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
|
wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
|
||||||
const wxBitmap& pushedBitmap, bool toggle,
|
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 )
|
const wxString& helpString1, const wxString& helpString2 )
|
||||||
{
|
{
|
||||||
m_hasToolAlready = TRUE;
|
m_hasToolAlready = TRUE;
|
||||||
|
Reference in New Issue
Block a user