DoPrepareDC needs the dc.

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

diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h
index 443e3e559e83fa08ba902207dc77f9a082020467..6bb1e36d64387b36d3dfdbf68fc388beb5254983 100644 (file)
--- a/include/wx/motif/toolbar.h
+++ b/include/wx/motif/toolbar.h
@@ -12,8 +12,8 @@
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 
 #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
 #endif
 
 class WXDLLEXPORT wxToolBar : public wxToolBarBase


@@ -21,53 +21,66 @@ class WXDLLEXPORT wxToolBar : public wxToolBarBase
 public:
     // ctors and dtor
     wxToolBar() { Init(); }
 public:
     // ctors and dtor
     wxToolBar() { Init(); }

-
+    

     wxToolBar(wxWindow *parent,
     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();
     {
         Init();

-
+        

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

-
+    

     bool Create(wxWindow *parent,
     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();
     virtual ~wxToolBar();

-
+    

     // override/implement base class virtuals
     // override/implement base class virtuals

-    virtual wxToolBarTool *FindToolForPosition(wxCoord x, wxCoord y) const;
-
+    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
+    

     virtual bool Realize();
     virtual bool Realize();

-
+    

     // implementation from now on
     // implementation from now on

-
+    

     // find tool by widget
     // find tool by widget

-    wxToolBarTool *FindToolByWidget(WXWidget w) const;
-
-protected:
+    wxToolBarToolBase *FindToolByWidget(WXWidget w) const;
+    
+private:

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

-
+    

     // implement base class pure virtuals
     // implement base class pure virtuals

-    virtual bool DoInsertTool(size_t pos, wxToolBarTool *tool);
-    virtual bool DoDeleteTool(size_t pos, wxToolBarTool *tool);
-
-    virtual void DoEnableTool(wxToolBarTool *tool, bool enable);
-    virtual void DoToggleTool(wxToolBarTool *tool, bool toggle);
-    virtual void DoSetToggle(wxToolBarTool *tool, bool toggle);
-
+    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 wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,
+                                          wxObject *clientData,
+                                          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
 private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 
 #endif

-    // _WX_TOOLBAR_H_
+// _WX_TOOLBAR_H_