X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..45b81639ef31938fbcf512519dbd74a54fbcd1d5:/include/wx/palmos/toolbar.h diff --git a/include/wx/palmos/toolbar.h b/include/wx/palmos/toolbar.h index f6e689a8ba..4e4d85455e 100644 --- a/include/wx/palmos/toolbar.h +++ b/include/wx/palmos/toolbar.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/palmos/toolbar.h // Purpose: wxToolBar class -// Author: William Osborne +// Author: William Osborne - minimal working wxPalmOS port // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,10 +12,6 @@ #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" @@ -60,10 +56,7 @@ public: // implementation only from now on // ------------------------------- - virtual void SetWindowStyleFlag(long style); - void OnMouseEvent(wxMouseEvent& event); - void OnSysColourChanged(wxSysColourChangedEvent& event); void SetFocus() {} @@ -90,7 +83,8 @@ protected: 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;