* wxThread fixes

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

diff --git a/src/common/tbarsmpl.cpp b/src/common/tbarsmpl.cpp
index 10d7117d601460c58d159a3626be861769727096..c0d5dbded34100fdc65c5bd1696d1abb44b03a90 100644 (file)
--- a/src/common/tbarsmpl.cpp
+++ b/src/common/tbarsmpl.cpp
@@ -75,7 +75,7 @@ wxToolBarSimple::~wxToolBarSimple ()
 {
 }
 
 {
 }
 

-void wxToolBarSimple::OnPaint (wxPaintEvent& event)
+void wxToolBarSimple::OnPaint (wxPaintEvent& WXUNUSED(event))

 {
   wxPaintDC dc(this);
   PrepareDC(dc);
 {
   wxPaintDC dc(this);
   PrepareDC(dc);


@@ -103,7 +103,7 @@ void wxToolBarSimple::OnSize ( wxSizeEvent& event )
   wxToolBarBase::OnSize(event);
 }
 
   wxToolBarBase::OnSize(event);
 }
 

-void wxToolBarSimple::OnKillFocus (wxFocusEvent& event)
+void wxToolBarSimple::OnKillFocus (wxFocusEvent& WXUNUSED(event))

 {
   OnMouseEnter(m_pressedTool = m_currentTool = -1);
 }
 {
   OnMouseEnter(m_pressedTool = m_currentTool = -1);
 }


@@ -212,8 +212,10 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
 
   if (bitmap && bitmap->Ok())
   {
 
   if (bitmap && bitmap->Ok())
   {

+#ifndef __WXGTK__

     if (bitmap->GetPalette())
       memDC.SetPalette(*bitmap->GetPalette());
     if (bitmap->GetPalette())
       memDC.SetPalette(*bitmap->GetPalette());

+#endif

 
     int ax = (int)tool->m_x,
         ay = (int)tool->m_y,
 
     int ax = (int)tool->m_x,
         ay = (int)tool->m_y,


@@ -246,17 +248,19 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
             &memDC, 0, 0);
     }
     memDC.SelectObject(wxNullBitmap);
             &memDC, 0, 0);
     }
     memDC.SelectObject(wxNullBitmap);

+#ifndef __WXGTK__

     memDC.SetPalette(wxNullPalette);
     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;
   }
   // 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();
     drawBorder = wxColourDisplay();

-    #else       // Inversion works fine under Windows
+#else       // Inversion works fine under Windows

     drawBorder = FALSE;
     drawBorder = FALSE;

-    #endif
+#endif

 
     if (!drawBorder)
     {
 
     if (!drawBorder)
     {


@@ -315,7 +319,8 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
 
 void wxToolBarSimple::ToggleTool(int index, bool toggle)
 {
 
 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();
   if (node)
   {
     wxToolBarTool *tool = (wxToolBarTool *)node->Data();


@@ -340,7 +345,8 @@ void wxToolBarSimple::ToggleTool(int index, bool toggle)
 //
 void wxToolBarSimple::SpringUpButton(int index)
 {
 //
 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){
   if (node) {
     wxToolBarTool *tool = (wxToolBarTool *)node->Data();
     if (tool && !tool->m_isToggle && tool->m_toggleState){


@@ -358,7 +364,7 @@ void wxToolBarSimple::SpringUpButton(int index)
   }
 }
 
   }
 }
 

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

 {
   m_currentRowsOrColumns = 0;
   m_lastX = m_xMargin;
 {
   m_currentRowsOrColumns = 0;
   m_lastX = m_xMargin;