Deprecate second parameter of wxSlider::SetTickFreq().

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

diff --git a/include/wx/palmos/toolbar.h b/include/wx/palmos/toolbar.h
index f6e689a8ba3e1956b78e761e6adeb8e8f3bcf6f3..a0db54f1c3c98235e56897ad172457a2166758a0 100644 (file)
--- a/include/wx/palmos/toolbar.h
+++ b/include/wx/palmos/toolbar.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/toolbar.h
 // Purpose:     wxToolBar class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/toolbar.h
 // Purpose:     wxToolBar class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,15 +12,11 @@
 #ifndef _WX_TBAR95_H_
 #define _WX_TBAR95_H_
 
 #ifndef _WX_TBAR95_H_
 #define _WX_TBAR95_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "toolbar.h"
-#endif
-

 #if wxUSE_TOOLBAR
 
 #include "wx/dynarray.h"
 
 #if wxUSE_TOOLBAR
 
 #include "wx/dynarray.h"
 

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

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


@@ -60,10 +56,7 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-    virtual void SetWindowStyleFlag(long style);
-

     void OnMouseEvent(wxMouseEvent& event);
     void OnMouseEvent(wxMouseEvent& event);

-    void OnSysColourChanged(wxSysColourChangedEvent& event);

 
     void SetFocus() {}
 
 
     void SetFocus() {}
 


@@ -90,7 +83,8 @@ protected:
                                           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);

 
     // return the appropriate size and flags for the toolbar control
     virtual wxSize DoGetBestSize() const;
 
     // return the appropriate size and flags for the toolbar control
     virtual wxSize DoGetBestSize() const;


@@ -110,7 +104,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)

-    DECLARE_NO_COPY_CLASS(wxToolBar)
+    wxDECLARE_NO_COPY_CLASS(wxToolBar);

 };
 
 #endif // wxUSE_TOOLBAR
 };
 
 #endif // wxUSE_TOOLBAR