fixing warning and compile error against 10.4

[wxWidgets.git] / include / wx / tbarbase.h

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 451fb1a1e435415f16411458138b861189355df7..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)
 };


@@ -476,6 +483,10 @@ public:
     // return true if this is a vertical toolbar, otherwise false
     bool IsVertical() const;
 
     // return true if this is a vertical toolbar, otherwise false
     bool IsVertical() const;
 

+    // these methods allow to access tools by their index in the toolbar
+    size_t GetToolsCount() const { return m_tools.GetCount(); }
+    const wxToolBarToolBase *GetToolByPos(int pos) const { return m_tools[pos]; }
+

 #if WXWIN_COMPATIBILITY_2_8
     // the old versions of the various methods kept for compatibility
     // don't use in the new code!
 #if WXWIN_COMPATIBILITY_2_8
     // the old versions of the various methods kept for compatibility
     // don't use in the new code!


@@ -559,16 +570,16 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-    size_t GetToolsCount() const { return m_tools.GetCount(); }
-

     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) ;
 
     // don't want toolbars to accept the focus
     virtual bool AcceptsFocus() const { return false; }
 
     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) ;
 
     // 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