a small compilation fix

[wxWidgets.git] / src / common / tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 793ef3787b7b24cb7353328980a363680e52e4e9..615d76c560c73209cf5d2637db44c8ed81c987bf 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:       wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -55,7 +55,7 @@ wxToolBarTool::wxToolBarTool(wxToolBar *owner, int theIndex,
                     const wxBitmap& theBitmap1, const  wxBitmap& theBitmap2,
             bool toggle, wxObject *clientData,
                  const wxString& helpS1, const wxString& helpS2,
                     const wxBitmap& theBitmap1, const  wxBitmap& theBitmap2,
             bool toggle, wxObject *clientData,
                  const wxString& helpS1, const wxString& helpS2,

-                    GtkWidget *item  )
+                    GtkWidget *pixmap  )

 #else
 wxToolBarTool::wxToolBarTool(int theIndex,
                     const wxBitmap& theBitmap1, const wxBitmap& theBitmap2, bool toggle,
 #else
 wxToolBarTool::wxToolBarTool(int theIndex,
                     const wxBitmap& theBitmap1, const wxBitmap& theBitmap2, bool toggle,


@@ -65,7 +65,8 @@ wxToolBarTool::wxToolBarTool(int theIndex,
   m_toolStyle = wxTOOL_STYLE_BUTTON;
 #ifdef __WXGTK__
   m_owner = owner;
   m_toolStyle = wxTOOL_STYLE_BUTTON;
 #ifdef __WXGTK__
   m_owner = owner;

-  m_item = item;
+  m_pixmap = pixmap;
+  m_item = (GtkWidget*) NULL;

   m_clientData = clientData;
   m_x = 0;
   m_y = 0;
   m_clientData = clientData;
   m_x = 0;
   m_y = 0;


@@ -89,6 +90,14 @@ wxToolBarTool::wxToolBarTool(int theIndex,
   }
   m_shortHelpString = helpS1;
   m_longHelpString = helpS2;
   }
   m_shortHelpString = helpS1;
   m_longHelpString = helpS2;

+  m_control = (wxControl*) NULL;
+}
+
+wxToolBarTool::wxToolBarTool(wxControl *control)
+{
+    m_toolStyle = wxTOOL_STYLE_CONTROL;
+    m_control = control;
+    m_index = control->GetId();

 }
 
 wxToolBarTool::~wxToolBarTool()
 }
 
 wxToolBarTool::~wxToolBarTool()


@@ -185,7 +194,7 @@ void wxToolBarBase::OnMouseEnter ( int toolIndex )
 // created and used as the pushed/toggled image.
 // If toggle is TRUE, the button toggles between the two states.
 wxToolBarTool *wxToolBarBase::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
 // created and used as the pushed/toggled image.
 // If toggle is TRUE, the button toggles between the two states.
 wxToolBarTool *wxToolBarBase::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,

-             bool toggle, long xPos, long yPos, wxObject *clientData,
+             bool toggle, wxCoord xPos, wxCoord yPos, wxObject *clientData,

              const wxString& helpString1, const wxString& helpString2)
 {
 #ifdef __WXGTK__
              const wxString& helpString1, const wxString& helpString2)
 {
 #ifdef __WXGTK__


@@ -220,6 +229,7 @@ wxToolBarTool *wxToolBarBase::AddTool(int index, const wxBitmap& bitmap, const w
 void wxToolBarBase::AddSeparator ()
 {
   wxToolBarTool *tool = new wxToolBarTool;
 void wxToolBarBase::AddSeparator ()
 {
   wxToolBarTool *tool = new wxToolBarTool;

+  tool->m_index = -1;

   tool->m_toolStyle = wxTOOL_STYLE_SEPARATOR;
   m_tools.Append(-1, tool);
 }
   tool->m_toolStyle = wxTOOL_STYLE_SEPARATOR;
   m_tools.Append(-1, tool);
 }


@@ -397,7 +407,7 @@ void wxToolBarBase::Command(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 {
 }
 

-void wxToolBarBase::Layout()
+void wxToolBarBase::LayoutTools()

 {
 }
 
 {
 }
 


@@ -723,7 +733,13 @@ void wxToolBarBase::ViewStart (int *x, int *y) const
   *y = m_yScrollPosition;
 }
 
   *y = m_yScrollPosition;
 }
 

-void wxToolBarBase::OnIdle(wxIdleEvent& event)
+void wxToolBarBase::OnIdle(wxIdleEvent&
+#ifdef __WXGTK__
+                            WXUNUSED(event)
+#else
+                            event
+#endif
+                          )

 {
 #ifndef __WXGTK__
     wxWindow::OnIdle(event);
 {
 #ifndef __WXGTK__
     wxWindow::OnIdle(event);


@@ -761,12 +777,4 @@ void wxToolBarBase::DoToolbarUpdates()
     }
 }
 
     }
 }
 

-#ifdef __WXMSW__
-// Circumvent wxControl::MSWOnMouseMove which doesn't set the cursor.
-void wxToolBarBase::MSWOnMouseMove(int x, int y, WXUINT flags)
-{
-    wxWindow::MSWOnMouseMove(x, y, flags);
-}
-#endif
-

 #endif
 #endif