X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/982b2cfc58f424589a11538f6f7deef3b3217f0f..fb4888a650065c9a24572d6867345f34adafaa37:/include/wx/motif/toolbar.h?ds=sidebyside

diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h
index bbf08831cc..6bb1e36d64 100644
--- a/include/wx/motif/toolbar.h
+++ b/include/wx/motif/toolbar.h
@@ -12,8 +12,8 @@
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 
-#ifdef __GNUG__
-    #pragma interface "toolbar.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "toolbar.h"
 #endif
 
 class WXDLLEXPORT wxToolBar : public wxToolBarBase
@@ -21,62 +21,66 @@ class WXDLLEXPORT wxToolBar : public wxToolBarBase
 public:
     // ctors and dtor
     wxToolBar() { Init(); }
-
+    
     wxToolBar(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
-                const wxString& name = wxToolBarNameStr)
+        wxWindowID id,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = wxNO_BORDER | wxTB_HORIZONTAL,
+        const wxString& name = wxToolBarNameStr)
     {
         Init();
-
+        
         Create(parent, id, pos, size, style, name);
     }
-
+    
     bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
-                const wxString& name = wxToolBarNameStr);
-
+        wxWindowID id,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = wxNO_BORDER | wxTB_HORIZONTAL,
+        const wxString& name = wxToolBarNameStr);
+    
     virtual ~wxToolBar();
-
+    
     // override/implement base class virtuals
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
-
+    
     virtual bool Realize();
-
+    
     // implementation from now on
-
+    
     // find tool by widget
     wxToolBarToolBase *FindToolByWidget(WXWidget w) const;
-
-protected:
+    
+private:
     // common part of all ctors
     void Init();
-
+    
     // implement base class pure virtuals
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
-
+    
     virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
     virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
-
+    
     virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxBitmap& bitmap1,
-                                          const wxBitmap& bitmap2,
-                                          bool toggle,
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,
                                           wxObject *clientData,
-                                          const wxString& shortHelpString,
-                                          const wxString& longHelpString);
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);
     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)
 };
 
 #endif
-    // _WX_TOOLBAR_H_
+// _WX_TOOLBAR_H_