compilation fix (float => wxCoord)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 6eceed4124c9589c7cb0799c0e557ed16677acf4..5c59c3814d385a897af42a4169534a2e18715904 100644 (file)
--- 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,
     // 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);
       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 6eceed4124c9589c7cb0799c0e557ed16677acf4..5c59c3814d385a897af42a4169534a2e18715904 100644 (file)
--- 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,
     // 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);
       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 2e0def79b69a244209d38ebdbdc5da409bdbd70b..c23fc6e6fbe2820b91756a89c60500a857d174f7 100644 (file)
--- 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,
 
 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;
   const wxString& helpString1, const wxString& helpString2 )
 {
     m_hasToolAlready = TRUE;

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 2e0def79b69a244209d38ebdbdc5da409bdbd70b..c23fc6e6fbe2820b91756a89c60500a857d174f7 100644 (file)
--- 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,
 
 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;
   const wxString& helpString1, const wxString& helpString2 )
 {
     m_hasToolAlready = TRUE;