GetIcon() returns wxIconLocation, not wxIcon, now

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

diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h
index f7864c43afb6f573afd47ccdcea243a02b25fb33..14cd50c0ee55778749f252d7b30a0d97e532e6b5 100644 (file)
--- a/include/wx/motif/toolbar.h
+++ b/include/wx/motif/toolbar.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 

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

 #pragma interface "toolbar.h"
 #endif
 
 #pragma interface "toolbar.h"
 #endif
 


@@ -53,7 +53,7 @@ public:
     // find tool by widget
     wxToolBarToolBase *FindToolByWidget(WXWidget w) const;
     
     // find tool by widget
     wxToolBarToolBase *FindToolByWidget(WXWidget w) const;
     

-protected:
+private:

     // common part of all ctors
     void Init();
     
     // common part of all ctors
     void Init();
     


@@ -66,14 +66,18 @@ protected:
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
     
     virtual wxToolBarToolBase *CreateTool(int id,
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
     
     virtual wxToolBarToolBase *CreateTool(int id,

-        const wxBitmap& bitmap1,
-        const wxBitmap& bitmap2,
-        bool toggle,
-        wxObject *clientData,
-        const wxString& shortHelpString,
-        const wxString& longHelpString);
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,
+                                          wxObject *clientData,
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);

     virtual wxToolBarToolBase *CreateTool(wxControl *control);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);

-    
+
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);

 private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };