Correctly recognize when wglChoosePixelFormatARB() fails.

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

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index f6bc3617dc9c3fbb768680244ceba31cdeba288a..94d015f1554641d1d16ffce7064328b70b7bb948 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -61,7 +61,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject)
 
 wxToolBarToolBase::~wxToolBarToolBase()
 {
+#if wxUSE_MENUS
     delete m_dropdownMenu;
+#endif
+
     if ( IsControl() )
         GetControl()->Destroy();
 }
@@ -121,11 +124,13 @@ bool wxToolBarToolBase::SetLongHelp(const wxString& help)
 }
 
 
+#if wxUSE_MENUS
 void wxToolBarToolBase::SetDropdownMenu(wxMenu* menu)
 {
     delete m_dropdownMenu;
     m_dropdownMenu = menu;
 }
+#endif
 
 
 // ----------------------------------------------------------------------------
@@ -729,6 +734,7 @@ void wxToolBarBase::UpdateWindowUI(long flags)
     }
 }
 
+#if wxUSE_MENUS
 bool wxToolBarBase::SetDropdownMenu(int toolid, wxMenu* menu)
 {
     wxToolBarToolBase * const tool = FindById(toolid);
@@ -741,6 +747,7 @@ bool wxToolBarBase::SetDropdownMenu(int toolid, wxMenu* menu)
 
     return true;
 }
+#endif
 
 #if WXWIN_COMPATIBILITY_2_8