use correct scale when drawing

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

diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h
index ca6a14377f7e7ee7e73b99ff4de81de149729582..486bfa4c86f7b081daddaf7e53cf7871a6c0dc22 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_
 

-class WXDLLEXPORT wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase

 {
 public:
     // ctors and dtor
 {
 public:
     // ctors and dtor


@@ -22,7 +22,7 @@ public:
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,

-        long style = wxNO_BORDER | wxTB_HORIZONTAL,
+        long style = wxTB_HORIZONTAL,

         const wxString& name = wxToolBarNameStr)
     {
         Init();
         const wxString& name = wxToolBarNameStr)
     {
         Init();


@@ -34,7 +34,7 @@ public:
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,

-        long style = wxNO_BORDER | wxTB_HORIZONTAL,
+        long style = wxTB_HORIZONTAL,

         const wxString& name = wxToolBarNameStr);
 
     virtual ~wxToolBar();
         const wxString& name = wxToolBarNameStr);
 
     virtual ~wxToolBar();


@@ -69,7 +69,8 @@ private:
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);

-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);

 
     virtual void DoSetSize(int x, int y,
                            int width, int height,
 
     virtual void DoSetSize(int x, int y,
                            int width, int height,