From fd69e87d2586726e57446d7208ceb8854bc74166 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 12 Nov 1999 19:41:43 +0000 Subject: [PATCH] compilation fix (float => wxCoord) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/tbargtk.h | 2 +- include/wx/gtk1/tbargtk.h | 2 +- src/gtk/tbargtk.cpp | 2 +- src/gtk1/tbargtk.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h index 6eceed4124..5c59c3814d 100644 --- a/include/wx/gtk/tbargtk.h +++ b/include/wx/gtk/tbargtk.h @@ -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); diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h index 6eceed4124..5c59c3814d 100644 --- a/include/wx/gtk1/tbargtk.h +++ b/include/wx/gtk1/tbargtk.h @@ -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); diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 2e0def79b6..c23fc6e6fb 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -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; diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index 2e0def79b6..c23fc6e6fb 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/tbargtk.cpp @@ -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; -- 2.47.2