subdindented paragraphs support (patch 933436)

[wxWidgets.git] / src / univ / toolbar.cpp

diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index f4cf7740fad0b4d12c67fa546a39f075f2c60975..74ff8b55e0effb50ad7093cf2572c97eeeba88ed 100644 (file)
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -18,7 +18,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univtoolbar.h"
 #endif
 
     #pragma implementation "univtoolbar.h"
 #endif
 


@@ -645,6 +645,8 @@ bool wxToolBar::PerformAction(const wxControlAction& action,
                               const wxString& strArg)
 {
     wxToolBarTool *tool = (wxToolBarTool*) FindById(numArg);
                               const wxString& strArg)
 {
     wxToolBarTool *tool = (wxToolBarTool*) FindById(numArg);

+    if (!tool)
+        return false;

     
     if ( action == wxACTION_TOOLBAR_TOGGLE )
     {
     
     if ( action == wxACTION_TOOLBAR_TOGGLE )
     {