Respect wxUSE_MENUS in toolbar base classes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index bbb74680efecb2151a22009eb32f347fd1b3c590..f6ef259ce39b6b3cbc7f9dd06c0e473440c0396d 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -199,10 +199,12 @@ public:
     virtual void Detach() { m_tbar = NULL; }
     virtual void Attach(wxToolBarBase *tbar) { m_tbar = tbar; }
 
     virtual void Detach() { m_tbar = NULL; }
     virtual void Attach(wxToolBarBase *tbar) { m_tbar = tbar; }
 

+#if wxUSE_MENUS

     // these methods are only for tools of wxITEM_DROPDOWN kind (but even such
     // tools can have a NULL associated menu)
     virtual void SetDropdownMenu(wxMenu *menu);
     wxMenu *GetDropdownMenu() const { return m_dropdownMenu; }
     // these methods are only for tools of wxITEM_DROPDOWN kind (but even such
     // tools can have a NULL associated menu)
     virtual void SetDropdownMenu(wxMenu *menu);
     wxMenu *GetDropdownMenu() const { return m_dropdownMenu; }

+#endif

 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors


@@ -222,7 +224,10 @@ protected:
         m_toggled = false;
         m_enabled = true;
 
         m_toggled = false;
         m_enabled = true;
 

+#if wxUSE_MENUS

         m_dropdownMenu = NULL;
         m_dropdownMenu = NULL;

+#endif
+

     }
 
     wxToolBarBase *m_tbar;  // the toolbar to which we belong (may be NULL)
     }
 
     wxToolBarBase *m_tbar;  // the toolbar to which we belong (may be NULL)


@@ -257,7 +262,9 @@ protected:
     wxString m_shortHelpString;
     wxString m_longHelpString;
 
     wxString m_shortHelpString;
     wxString m_longHelpString;
 

+#if wxUSE_MENUS

     wxMenu *m_dropdownMenu;
     wxMenu *m_dropdownMenu;

+#endif

 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToolBarToolBase)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToolBarToolBase)
 };


@@ -569,8 +576,10 @@ public:
     // don't want toolbars to accept the focus
     virtual bool AcceptsFocus() const { return false; }
 
     // don't want toolbars to accept the focus
     virtual bool AcceptsFocus() const { return false; }
 

+#if wxUSE_MENUS

     // Set dropdown menu
     bool SetDropdownMenu(int toolid, wxMenu *menu);
     // Set dropdown menu
     bool SetDropdownMenu(int toolid, wxMenu *menu);

+#endif

 
 protected:
     // to implement in derived classes
 
 protected:
     // to implement in derived classes

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()
 {
 
 wxToolBarToolBase::~wxToolBarToolBase()
 {

+#if wxUSE_MENUS

     delete m_dropdownMenu;
     delete m_dropdownMenu;

+#endif
+

     if ( IsControl() )
         GetControl()->Destroy();
 }
     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;
 }
 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);
 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;
 }
 
     return true;
 }

+#endif

 
 #if WXWIN_COMPATIBILITY_2_8
 
 
 #if WXWIN_COMPATIBILITY_2_8