Accelerators implemented for wxMotif; some wxComboBox stupidities cured

[wxWidgets.git] / include / wx / motif / toolbar.h

diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h
index 4ccb016fb948fdbaf7b8a85d24dde20f5a516a65..590b417b4f5bc5e8063191957ec22a15225e88d5 100644 (file)
--- a/include/wx/motif/toolbar.h
+++ b/include/wx/motif/toolbar.h
@@ -32,7 +32,9 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
 
   inline wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxNO_BORDER|wxTB_HORIZONTAL,
 
   inline wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxNO_BORDER|wxTB_HORIZONTAL,

-            const wxString& name = wxToolBarNameStr)
+                  const wxString& name = wxToolBarNameStr):
+  m_widgets(wxKEY_INTEGER)
+

   {
     Create(parent, id, pos, size, style, name);
   }
   {
     Create(parent, id, pos, size, style, name);
   }


@@ -68,7 +70,18 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
   // necessary for completing the toolbar construction.
   bool Realize() { return CreateTools(); };
 
   // necessary for completing the toolbar construction.
   bool Realize() { return CreateTools(); };
 

+// Implementation
+  void DestroyPixmaps();
+  int FindIndexForWidget(WXWidget w);
+  WXWidget FindWidgetForIndex(int index);
+

 protected:
 protected:

+  // List of widgets in the toolbar, indexed by tool index
+  wxList    m_widgets;
+
+  // List of pixmaps to destroy when tools are recreated or
+  // or toolbar is destroyed.
+  wxList    m_pixmaps;

 
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };