Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added labels support for toolbar controls for wxMac and wxMSW (modified patch 1613603)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-18 23:13:18 +00:00
parent 88c23b64c7
commit cdb11cb99e
13 changed files with 235 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/generic/buttonbar.h
View File

@@ -6,7 +6,7 @@
// Created: 2006-04-13
// Id: $Id$
// Copyright: (c) Julian Smart, Robert Roebling, Vadim Zeitlin,
// SciTech Software, Inc.
// SciTech Software, Inc.
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -23,7 +23,7 @@ class WXDLLEXPORT wxButtonToolBarTool;
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxButtonToolBar : public wxToolBarBase
{
{
public:
// construction/destruction
wxButtonToolBar() { Init(); }
@@ -45,7 +45,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxToolBarNameStr );
virtual ~wxButtonToolBar();
virtual bool Realize();
@@ -73,7 +73,8 @@ protected:
wxObject *clientData,
const wxString& shortHelp,
const wxString& longHelp);
virtual wxToolBarToolBase *CreateTool(wxControl *control);
virtual wxToolBarToolBase *CreateTool(wxControl *control,
const wxString& label);
virtual wxSize DoGetBestClientSize() const;