Committing in .

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

diff --git a/src/common/tbarsmpl.cpp b/src/common/tbarsmpl.cpp
index 10d7117d601460c58d159a3626be861769727096..662c6aa4f806a9fc9d7631490274d26dd6d183b6 100644 (file)
--- a/src/common/tbarsmpl.cpp
+++ b/src/common/tbarsmpl.cpp
@@ -21,7 +21,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/wx.h"
+#include "wx/settings.h"
+#include "wx/window.h"
+#include "wx/dcclient.h"
+#include "wx/dcmemory.h"
 #endif
 
 #if wxUSE_TOOLBAR
@@ -75,7 +78,7 @@ wxToolBarSimple::~wxToolBarSimple ()
 {
 }
 
-void wxToolBarSimple::OnPaint (wxPaintEvent& event)
+void wxToolBarSimple::OnPaint (wxPaintEvent& WXUNUSED(event))
 {
   wxPaintDC dc(this);
   PrepareDC(dc);
@@ -103,15 +106,15 @@ void wxToolBarSimple::OnSize ( wxSizeEvent& event )
   wxToolBarBase::OnSize(event);
 }
 
-void wxToolBarSimple::OnKillFocus (wxFocusEvent& event)
+void wxToolBarSimple::OnKillFocus (wxFocusEvent& WXUNUSED(event))
 {
   OnMouseEnter(m_pressedTool = m_currentTool = -1);
 }
 
 void wxToolBarSimple::OnMouseEvent ( wxMouseEvent & event )
 {
-    long x, y;
-    event.Position(&x, &y);
+    wxCoord x, y;
+    event.GetPosition(&x, &y);
     wxToolBarTool *tool = FindToolForPosition(x, y);
 
     if (event.LeftDown())
@@ -212,8 +215,10 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
 
   if (bitmap && bitmap->Ok())
   {
+#ifndef __WXGTK__
     if (bitmap->GetPalette())
       memDC.SetPalette(*bitmap->GetPalette());
+#endif
 
     int ax = (int)tool->m_x,
         ay = (int)tool->m_y,
@@ -246,17 +251,19 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
             &memDC, 0, 0);
     }
     memDC.SelectObject(wxNullBitmap);
+#ifndef __WXGTK__
     memDC.SetPalette(wxNullPalette);
+#endif
   }
   // No second bitmap, so draw a thick line around bitmap, or invert if mono
   else if (tool->m_toggleState)
   {
     bool drawBorder = FALSE;
-    #ifdef __X__ // X doesn't invert properly on colour
+#ifdef __X__ // X doesn't invert properly on colour
     drawBorder = wxColourDisplay();
-    #else       // Inversion works fine under Windows
+#else       // Inversion works fine under Windows
     drawBorder = FALSE;
-    #endif
+#endif
 
     if (!drawBorder)
     {
@@ -315,7 +322,8 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
 
 void wxToolBarSimple::ToggleTool(int index, bool toggle)
 {
-  wxNode *node = m_tools.Find((long)index);
+  wxNode *node = (wxNode*) NULL;
+  node = m_tools.Find((long)index);
   if (node)
   {
     wxToolBarTool *tool = (wxToolBarTool *)node->Data();
@@ -340,7 +348,8 @@ void wxToolBarSimple::ToggleTool(int index, bool toggle)
 //
 void wxToolBarSimple::SpringUpButton(int index)
 {
-  wxNode *node=m_tools.Find((long)index);
+  wxNode *node = (wxNode*) NULL;
+  node=m_tools.Find((long)index);
   if (node) {
     wxToolBarTool *tool = (wxToolBarTool *)node->Data();
     if (tool && !tool->m_isToggle && tool->m_toggleState){
@@ -358,7 +367,7 @@ void wxToolBarSimple::SpringUpButton(int index)
   }
 }
 
-void wxToolBarSimple::Layout(void)
+void wxToolBarSimple::LayoutTools(void)
 {
   m_currentRowsOrColumns = 0;
   m_lastX = m_xMargin;