Support mouse click through as otherwise clicking inside an inactive window causes...

[wxWidgets.git] / src / xrc / xh_toolb.cpp

diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index 2d19946e33629aff22f7e99cfe29d7da3cab7045..fc0c19c7b9cac829d6b5eaa2751938c5667d1fc3 100644 (file)
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -78,7 +78,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
 
             kind = wxITEM_CHECK;
         }
 
             kind = wxITEM_CHECK;
         }

-
+#if wxUSE_MENUS

         // check whether we have dropdown tag inside
         wxMenu *menu = NULL; // menu for drop down items
         wxXmlNode * const nodeDropdown = GetParamNode("dropdown");
         // check whether we have dropdown tag inside
         wxMenu *menu = NULL; // menu for drop down items
         wxXmlNode * const nodeDropdown = GetParamNode("dropdown");


@@ -122,25 +122,26 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
                 }
             }
         }
                 }
             }
         }

-
-        wxToolBarToolBase * const
-            tool = m_toolbar->AddTool
-                             (
-                                GetID(),
-                                GetText(wxT("label")),
-                                GetBitmap(wxT("bitmap"), wxART_TOOLBAR),
-                                GetBitmap(wxT("bitmap2"), wxART_TOOLBAR),
-                                kind,
-                                GetText(wxT("tooltip")),
-                                GetText(wxT("longhelp"))
-                             );
+#endif
+        wxToolBarToolBase * const tool =
+            m_toolbar->AddTool
+                       (
+                          GetID(),
+                          GetText(wxT("label")),
+                          GetBitmap(wxT("bitmap"), wxART_TOOLBAR, m_toolSize),
+                          GetBitmap(wxT("bitmap2"), wxART_TOOLBAR, m_toolSize),
+                          kind,
+                          GetText(wxT("tooltip")),
+                          GetText(wxT("longhelp"))
+                       );

 
         if ( GetBool(wxT("disabled")) )
             m_toolbar->EnableTool(GetID(), false);
 
         if ( GetBool(wxT("disabled")) )
             m_toolbar->EnableTool(GetID(), false);

-
+#if wxUSE_MENUS

         if ( menu )
             tool->SetDropdownMenu(menu);
         if ( menu )
             tool->SetDropdownMenu(menu);

-
+#endif
+        

         return m_toolbar; // must return non-NULL
     }
 
         return m_toolbar; // must return non-NULL
     }
 


@@ -172,9 +173,9 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
                          GetName());
         SetupWindow(toolbar);
 
                          GetName());
         SetupWindow(toolbar);
 

-        wxSize bmpsize = GetSize(wxT("bitmapsize"));
-        if (!(bmpsize == wxDefaultSize))
-            toolbar->SetToolBitmapSize(bmpsize);
+        m_toolSize = GetSize(wxT("bitmapsize"));
+        if (!(m_toolSize == wxDefaultSize))
+            toolbar->SetToolBitmapSize(m_toolSize);

         wxSize margins = GetSize(wxT("margins"));
         if (!(margins == wxDefaultSize))
             toolbar->SetMargins(margins.x, margins.y);
         wxSize margins = GetSize(wxT("margins"));
         if (!(margins == wxDefaultSize))
             toolbar->SetMargins(margins.x, margins.y);